refactored some ManageAccount, WelcomeActivity and a few other things

8 files changed, 58 insertions, 79 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
index 787942b8d..a0b91a8c7 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
@@ -89,6 +89,7 @@ import de.pixart.messenger.ui.util.PendingItem;
 import de.pixart.messenger.utils.EmojiWrapper;
 import de.pixart.messenger.utils.ExceptionHelper;
 import de.pixart.messenger.utils.MenuDoubleTabUtil;
+import de.pixart.messenger.utils.SignupUtils;
 import de.pixart.messenger.utils.UIHelper;
 import de.pixart.messenger.utils.XmppUri;
 import de.pixart.messenger.xmpp.OnUpdateBlocklist;
@@ -235,7 +236,10 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         }
         boolean isConversationsListEmpty = xmppConnectionService.isConversationsListEmpty(ignore);
         if (isConversationsListEmpty && mRedirectInProcess.compareAndSet(false, true)) {
-            final Intent intent = getRedirectionIntent(noAnimation);
+            final Intent intent = SignupUtils.getRedirectionIntent(this);
+            if (noAnimation) {
+                intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+            }
             runOnUiThread(() -> {
                 startActivity(intent);
                 overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
@@ -247,34 +251,6 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         return mRedirectInProcess.get();
     }
 
-    private Intent getRedirectionIntent(boolean noAnimation) {
-        Account pendingAccount = xmppConnectionService.getPendingAccount();
-        Intent intent;
-        if (pendingAccount != null) {
-            intent = new Intent(this, EditAccountActivity.class);
-            intent.putExtra("jid", pendingAccount.getJid().asBareJid().toString());
-        } else {
-            if (xmppConnectionService.getAccounts().size() == 0) {
-                if (Config.X509_VERIFICATION) {
-                    intent = new Intent(this, ManageAccountActivity.class);
-                } else if (Config.MAGIC_CREATE_DOMAIN != null) {
-                    intent = new Intent(this, WelcomeActivity.class);
-                    WelcomeActivity.addInviteUri(intent, getIntent());
-                } else {
-                    intent = new Intent(this, EditAccountActivity.class);
-                }
-            } else {
-                intent = new Intent(this, StartConversationActivity.class);
-            }
-        }
-        intent.putExtra("init", true);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        if (noAnimation) {
-            intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
-        }
-        return intent;
-    }
-
     private void showDialogsIfMainIsOverview() {
         if (xmppConnectionService == null) {
             return;
diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
index 3d9c0e63e..426627510 100644
--- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
@@ -66,6 +66,7 @@ import de.pixart.messenger.ui.util.SoftKeyboardUtils;
 import de.pixart.messenger.utils.CryptoHelper;
 import de.pixart.messenger.utils.MenuDoubleTabUtil;
 import de.pixart.messenger.utils.Namespace;
+import de.pixart.messenger.utils.SignupUtils;
 import de.pixart.messenger.utils.UIHelper;
 import de.pixart.messenger.utils.XmppUri;
 import de.pixart.messenger.xml.Element;
@@ -268,8 +269,9 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
         if (mAccount != null
                 && mAccount.getStatus() != Account.State.ONLINE
                 && mFetchingAvatar) {
-            //TODO: maybe better redirect to StartConversationActivity
-            startActivity(new Intent(this, ManageAccountActivity.class));
+            Intent intent = new Intent(this, StartConversationActivity.class);
+            StartConversationActivity.addInviteUri(intent, getIntent());
+            startActivity(intent);
             overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
             finish();
         } else if (mInitMode && mAccount != null && mAccount.getStatus() == Account.State.ONLINE) {
@@ -301,8 +303,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
             xmppConnectionService.deleteAccount(mAccount);
         }
         if (xmppConnectionService.getAccounts().size() == 0 && Config.MAGIC_CREATE_DOMAIN != null) {
-            Intent intent = new Intent(EditAccountActivity.this, WelcomeActivity.class);
-            WelcomeActivity.addInviteUri(intent, getIntent());
+            Intent intent = SignupUtils.getSignUpIntent(this);
             startActivity(intent);
             overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
         }
@@ -398,7 +399,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
             if (wasFirstAccount) {
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
             }
-            WelcomeActivity.addInviteUri(intent, getIntent());
+            StartConversationActivity.addInviteUri(intent, getIntent());
             startActivity(intent);
             overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
             finish();
diff --git a/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java b/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java
index 10c68cc1d..b5f2c02e7 100644
--- a/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java
@@ -97,7 +97,7 @@ public class MagicCreateActivity extends XmppActivity implements TextWatcher, Ad
                     intent.putExtra("init", true);
                     intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
                     Toast.makeText(MagicCreateActivity.this, R.string.secure_password_generated, Toast.LENGTH_LONG).show();
-                    WelcomeActivity.addInviteUri(intent, getIntent());
+                    StartConversationActivity.addInviteUri(intent, getIntent());
                     startActivity(intent);
                     overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
                     finish();
diff --git a/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java b/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java
index 9d6df3980..469ce8021 100644
--- a/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java
@@ -50,7 +50,7 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC
         runOnUiThread(() -> {
             if (mInitialAccountSetup) {
                 Intent intent = new Intent(getApplicationContext(), StartConversationActivity.class);
-                WelcomeActivity.addInviteUri(intent, getIntent());
+                StartConversationActivity.addInviteUri(intent, getIntent());
                 intent.putExtra("init", true);
                 startActivity(intent);
             }
@@ -94,7 +94,7 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC
             if (mInitialAccountSetup) {
                 Intent intent = new Intent(getApplicationContext(), StartConversationActivity.class);
                 if (xmppConnectionService != null && xmppConnectionService.getAccounts().size() == 1) {
-                    WelcomeActivity.addInviteUri(intent, getIntent());
+                    StartConversationActivity.addInviteUri(intent, getIntent());
                     intent.putExtra("init", true);
                 }
                 startActivity(intent);
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index 5b337abb6..ade478aa1 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -81,6 +81,8 @@ import static de.pixart.messenger.ui.SettingsActivity.USE_BUNDLED_EMOJIS;
 
 public class StartConversationActivity extends XmppActivity implements XmppConnectionService.OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist, CreateConferenceDialog.CreateConferenceDialogListener, JoinConferenceDialog.JoinConferenceDialogListener {
 
+    public static final String EXTRA_INVITE_URI = "eu.siacs.conversations.invite_uri";
+
     private final int REQUEST_SYNC_CONTACTS = 0x28cf;
     private final int REQUEST_CREATE_CONFERENCE = 0x39da;
     private final PendingItem<Intent> pendingViewIntent = new PendingItem<>();
@@ -235,7 +237,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
     }
 
     private static boolean isViewIntent(final Intent i) {
-        return i != null && (Intent.ACTION_VIEW.equals(i.getAction()) || Intent.ACTION_SENDTO.equals(i.getAction()) || i.hasExtra(WelcomeActivity.EXTRA_INVITE_URI));
+        return i != null && (Intent.ACTION_VIEW.equals(i.getAction()) || Intent.ACTION_SENDTO.equals(i.getAction()) || i.hasExtra(EXTRA_INVITE_URI));
     }
 
     protected void hideToast() {
@@ -762,7 +764,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
     }
 
     protected boolean processViewIntent(@NonNull Intent intent) {
-        final String inviteUri = intent.getStringExtra(WelcomeActivity.EXTRA_INVITE_URI);
+        final String inviteUri = intent.getStringExtra(EXTRA_INVITE_URI);
         if (inviteUri != null) {
             Invite invite = new Invite(inviteUri);
             if (invite.isJidValid()) {
@@ -1183,6 +1185,12 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
         }
     }
 
+    public static void addInviteUri(Intent to, Intent from) {
+        if (from != null && from.hasExtra(EXTRA_INVITE_URI)) {
+            to.putExtra(EXTRA_INVITE_URI, from.getStringExtra(EXTRA_INVITE_URI));
+        }
+    }
+
     private class Invite extends XmppUri {
 
         public String account;
diff --git a/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java b/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java
index 66355f49c..c640e42da 100644
--- a/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java
@@ -5,6 +5,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
@@ -18,6 +19,7 @@ import java.util.regex.Pattern;
 import de.pixart.messenger.Config;
 import de.pixart.messenger.R;
 import de.pixart.messenger.persistance.DatabaseBackend;
+import de.pixart.messenger.utils.SignupUtils;
 import de.pixart.messenger.utils.XmppUri;
 import rocks.xmpp.addr.Jid;
 
@@ -26,17 +28,16 @@ public class UriHandlerActivity extends AppCompatActivity {
     public static final String ACTION_SCAN_QR_CODE = "scan_qr_code";
     private static final int REQUEST_SCAN_QR_CODE = 0x1234;
     private static final int REQUEST_CAMERA_PERMISSIONS_TO_SCAN = 0x6789;
-
     private boolean handled = false;
 
     public static void scan(Activity activity) {
-        if (ContextCompat.checkSelfPermission(activity, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M || ContextCompat.checkSelfPermission(activity, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
             Intent intent = new Intent(activity, UriHandlerActivity.class);
             intent.setAction(UriHandlerActivity.ACTION_SCAN_QR_CODE);
             intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
             activity.startActivity(intent);
         } else {
-            ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.CAMERA}, REQUEST_CAMERA_PERMISSIONS_TO_SCAN);
+            activity.requestPermissions(new String[]{Manifest.permission.CAMERA}, REQUEST_CAMERA_PERMISSIONS_TO_SCAN);
         }
     }
 
@@ -86,29 +87,36 @@ public class UriHandlerActivity extends AppCompatActivity {
         final Intent intent;
         final XmppUri xmppUri = new XmppUri(uri);
         final List<Jid> accounts = DatabaseBackend.getInstance(this).getAccountJids(); //TODO only look at enabled accounts
-
-        if (!xmppUri.isJidValid()) {
-            Toast.makeText(this, R.string.invalid_jid, Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        if (accounts.size() == 0 && Config.MAGIC_CREATE_DOMAIN != null) {
-            intent = new Intent(getApplicationContext(), WelcomeActivity.class);
-            WelcomeActivity.addInviteUri(intent, xmppUri);
-            startActivity(intent);
+        if (accounts.size() == 0) {
+            if (xmppUri.isJidValid()) {
+                intent = SignupUtils.getSignUpIntent(this);
+                startActivity(intent);
+            } else {
+                Toast.makeText(this, R.string.invalid_jid, Toast.LENGTH_SHORT).show();
+            }
             return;
         }
-
         if (xmppUri.isAction(XmppUri.ACTION_MESSAGE)) {
             final Jid jid = xmppUri.getJid();
             final String body = xmppUri.getBody();
-
             if (jid != null) {
-                intent = new Intent(getApplicationContext(), ShareViaAccountActivity.class);
-                intent.putExtra(ShareViaAccountActivity.EXTRA_CONTACT, jid.toString());
-                intent.putExtra(ShareViaAccountActivity.EXTRA_BODY, body);
+                Class clazz;
+                try {
+                    clazz = Class.forName("eu.siacs.conversations.ui.ShareViaAccountActivity");
+                } catch (ClassNotFoundException e) {
+                    clazz = null;
+                }
+                if (clazz != null) {
+                    intent = new Intent(this, clazz);
+                    intent.putExtra("contact", jid.toEscapedString());
+                    intent.putExtra("body", body);
+                } else {
+                    intent = new Intent(this, StartConversationActivity.class);
+                    intent.setData(uri);
+                    intent.putExtra("account", accounts.get(0).toEscapedString());
+                }
             } else {
-                intent = new Intent(getApplicationContext(), ShareWithActivity.class);
+                intent = new Intent(this, ShareWithActivity.class);
                 intent.setAction(Intent.ACTION_SEND);
                 intent.setType("text/plain");
                 intent.putExtra(Intent.EXTRA_TEXT, body);
@@ -119,14 +127,16 @@ public class UriHandlerActivity extends AppCompatActivity {
             intent.putExtra("jid", xmppUri.getJid().asBareJid().toString());
             intent.setData(uri);
             intent.putExtra("scanned", scanned);
-        } else {
+        } else if (xmppUri.isJidValid()) {
             intent = new Intent(getApplicationContext(), StartConversationActivity.class);
             intent.setAction(Intent.ACTION_VIEW);
             intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
             intent.putExtra("scanned", scanned);
             intent.setData(uri);
+        } else {
+            Toast.makeText(this, R.string.invalid_jid, Toast.LENGTH_SHORT).show();
+            return;
         }
-
         startActivity(intent);
     }
 
@@ -138,9 +148,7 @@ public class UriHandlerActivity extends AppCompatActivity {
             finish();
             return;
         }
-
         handled = true;
-
         switch (data.getAction()) {
             case Intent.ACTION_VIEW:
             case Intent.ACTION_SENDTO:
@@ -151,7 +159,6 @@ public class UriHandlerActivity extends AppCompatActivity {
                 startActivityForResult(intent, REQUEST_SCAN_QR_CODE);
                 return;
         }
-
         finish();
     }
 
diff --git a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
index cdb6a63a2..60461f1b6 100644
--- a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
@@ -43,7 +43,6 @@ import de.pixart.messenger.utils.XmppUri;
 
 public class WelcomeActivity extends XmppActivity {
 
-    public static final String EXTRA_INVITE_URI = "eu.siacs.conversations.invite_uri";
     boolean importSuccessful = false;
 
     @Override
@@ -329,19 +328,7 @@ public class WelcomeActivity extends XmppActivity {
     }
 
     public void addInviteUri(Intent intent) {
-        addInviteUri(intent, getIntent());
-    }
-
-    public static void addInviteUri(Intent intent, XmppUri uri) {
-        if (uri.isJidValid()) {
-            intent.putExtra(EXTRA_INVITE_URI, uri.toString());
-        }
-    }
-
-    public static void addInviteUri(Intent to, Intent from) {
-        if (from != null && from.hasExtra(EXTRA_INVITE_URI)) {
-            to.putExtra(EXTRA_INVITE_URI, from.getStringExtra(EXTRA_INVITE_URI));
-        }
+        StartConversationActivity.addInviteUri(intent, getIntent());
     }
 
     public static void launch(AppCompatActivity activity) {
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index d3e1fce9f..ef8b753d0 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -79,6 +79,7 @@ import de.pixart.messenger.services.XmppConnectionService;
 import de.pixart.messenger.services.XmppConnectionService.XmppConnectionBinder;
 import de.pixart.messenger.ui.util.PresenceSelector;
 import de.pixart.messenger.ui.util.SoftKeyboardUtils;
+import de.pixart.messenger.utils.AccountUtils;
 import de.pixart.messenger.utils.CryptoHelper;
 import de.pixart.messenger.utils.ExceptionHelper;
 import de.pixart.messenger.utils.MenuDoubleTabUtil;
@@ -365,8 +366,7 @@ public abstract class XmppActivity extends ActionBarActivity {
                     startActivity(intent);
                     overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
                 } else {
-                    final Intent intent = new Intent(getApplicationContext(), ManageAccountActivity.class);
-                    startActivity(intent);
+                    AccountUtils.launchManageAccounts(this);
                     overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
                 }
                 break;