Fix do not attempt to connect when redirecting to 'welcome'

threema-ch · May 7, 2019 · 75ed742 · 75ed742
1 parent d3ccf80
commit 75ed742
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/controllers/status.ts b/src/controllers/status.ts
@@ -161,7 +161,7 @@ export class StatusController {
      * Attempt to reconnect an Android device after a connection loss.
      */
     private reconnectAndroid(): void {
-        this.$log.warn(this.logTag, `Connection lost (Android). Reconnect attempt #${this.stateService.attempt + 1}`);
+        this.$log.info(this.logTag, `Connection lost (Android). Reconnect attempt #${this.stateService.attempt + 1}`);
 
         // Show expanded status bar (if on 'messenger')
         if (this.$state.includes('messenger')) {

diff --git a/src/services/webclient.ts b/src/services/webclient.ts
@@ -1215,6 +1215,11 @@ export class WebClientService {
             this.previousIncomingChunkSequenceNumber = null;
             this.previousChunkCache = null;
 
+            // Remove chosen task
+            // Note: This implicitly prevents automatic connection attempts
+            //       from the status controller.
+            this.chosenTask = threema.ChosenTask.None;
+
             // Reset general client information
             this.clientInfo = null;