summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authoranderklander <anderklander@gmail.com>2018-01-25 08:33:11 +0100
committerErik Larkö <erik@mullvad.net>2018-01-25 14:12:44 +0100
commitdfbe3aa97d2522b3142fc0791cccf4d22da85290 (patch)
tree468d05da9f358cdbfcd7a97206a8f188a2403e70
parentd032803bd4c6e76cd3ec0e75a809aaee8c04a08d (diff)
downloadmullvadvpn-dfbe3aa97d2522b3142fc0791cccf4d22da85290.tar.xz
mullvadvpn-dfbe3aa97d2522b3142fc0791cccf4d22da85290.zip
Update app.android
-rw-r--r--app/app.android.js16
1 files changed, 14 insertions, 2 deletions
diff --git a/app/app.android.js b/app/app.android.js
index 572ef83432..7b43183f37 100644
--- a/app/app.android.js
+++ b/app/app.android.js
@@ -23,9 +23,21 @@ const store = configureStore(initialState, memoryHistory);
const backend = new Backend(store);
DeviceEventEmitter.addListener('com.mullvad.backend-info', function(e: Event) {
- backend.init();
+ backend.setCredentials(args.credentials);
backend.sync();
- backend.autologin();
+ try {
+ await backend.autologin();
+ await backend.fetchRelaySettings();
+ await backend.fetchSecurityState();
+ await backend.connect();
+ } catch (e) {
+ if(e instanceof BackendError) {
+ if(e.type === 'NO_ACCOUNT') {
+ log.debug('No user set in the backend, showing window');
+ ipcRenderer.send('show-window');
+ }
+ }
+ }
});
MobileAppBridge.startBackend().then(_response => {}).catch(e => {