From 4a32ecbb47df299a7737fd6aedfd311f71529b5c Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Fri, 31 Aug 2018 01:46:08 +0200
Subject: [PATCH] finish WelcomeActivity and RegistrationActivity on
 successfull registration

---
 .../securesms/RegistrationActivity.java       |  2 +-
 .../securesms/WelcomeActivity.java            | 23 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java
index 46afb880b..ddb744233 100644
--- a/src/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -241,7 +241,6 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
     public void handleEvent(int eventId, Object data1, Object data2) {
         if (eventId==DcContext.DC_EVENT_CONFIGURE_PROGRESS) {
             long progress = (Long)data1;
-            Log.i("DeltaChat", String.format("configure-progress=%d", (int)progress));
             if (progress==0/*error/aborted*/) {
                 progressDialog.dismiss();
             }
@@ -252,6 +251,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
                 progressDialog.dismiss();
                 Intent conversationList = new Intent(getApplicationContext(), ConversationListActivity.class);
                 startActivity(conversationList);
+                finish();
             }
         }
     }
diff --git a/src/org/thoughtcrime/securesms/WelcomeActivity.java b/src/org/thoughtcrime/securesms/WelcomeActivity.java
index 51ab0d27a..825d46c0c 100644
--- a/src/org/thoughtcrime/securesms/WelcomeActivity.java
+++ b/src/org/thoughtcrime/securesms/WelcomeActivity.java
@@ -16,6 +16,10 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.b44t.messenger.DcContext;
+import com.b44t.messenger.DcEventCenter;
+
+import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.permissions.Permissions;
 
 /**
@@ -24,7 +28,7 @@ import org.thoughtcrime.securesms.permissions.Permissions;
  *
  * @author Daniel Böhrs
  */
-public class WelcomeActivity extends BaseActionBarActivity {
+public class WelcomeActivity extends BaseActionBarActivity implements DcEventCenter.DcEventDelegate {
 
     private class WelcomePagerAdapter extends PagerAdapter {
 
@@ -81,6 +85,13 @@ public class WelcomeActivity extends BaseActionBarActivity {
         setContentView(R.layout.welcome_activity);
 
         initializeResources();
+        DcHelper.getContext(this).eventCenter.addObserver(this, DcContext.DC_EVENT_CONFIGURE_PROGRESS);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        DcHelper.getContext(this).eventCenter.removeObservers(this);
     }
 
     @Override
@@ -104,7 +115,7 @@ public class WelcomeActivity extends BaseActionBarActivity {
     private void startRegistrationActivity() {
         Intent intent = new Intent(this, RegistrationActivity.class);
         startActivity(intent);
-        finish();
+        // no finish() here, the back key should take the user back from RegistrationActivity to WelcomeActivity
     }
 
     @SuppressLint("InlinedApi")
@@ -120,4 +131,12 @@ public class WelcomeActivity extends BaseActionBarActivity {
                 .execute();
     }
 
+    public void handleEvent(int eventId, Object data1, Object data2) {
+        if (eventId== DcContext.DC_EVENT_CONFIGURE_PROGRESS) {
+            long progress = (Long)data1;
+            if (progress==1000/*done*/) {
+                finish(); // remove ourself from the activity stack (finishAffinity is available in API 16, we're targeting API 14)
+            }
+        }
+    }
 }