diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0efcfc68a..73f4c7553 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -295,6 +295,16 @@
+
+
+
+
+
+
diff --git a/res/layout/profile_preference_view.xml b/res/layout/profile_preference_view.xml
index 38e031249..67043a88d 100644
--- a/res/layout/profile_preference_view.xml
+++ b/res/layout/profile_preference_view.xml
@@ -16,8 +16,8 @@
+ android:layout_marginRight="16dp"
+ android:layout_marginEnd="16dp">
contextRef;
+
+ public IncomingHandler(Context context) {
+ contextRef = new WeakReference<>(context);
+ }
+
+ @Override
+ public void handleMessage(@NonNull Message msg) {
+ Bundle data = msg.getData();
+ Context context = contextRef.get();
+ if (data != null && context != null && msg.what == ADD_ACCOUNT) {
+ String newAddress = data.getString(CONFIG_ADDRESS);
+ Log.d(TAG, "ADD ACCOUNT called for account: " + newAddress);
+
+ // check if account already exists, if so, switch to that account
+ DcAccounts accounts = DcHelper.getAccounts(context);
+ int[] accountIds = accounts.getAll();
+ for (int accountId : accountIds) {
+ DcContext dcContext = accounts.getAccount(accountId);
+ String accountAddress = dcContext.getConfig(CONFIG_ADDRESS);
+ if (accountAddress.equals(newAddress)) {
+ Log.d(TAG, newAddress + " already exists. Switching account.");
+ AccountManager.getInstance().switchAccount(context, accountId);
+ Intent switchAccountIntent = new Intent(context, ConversationListActivity.class);
+ switchAccountIntent.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK);
+ context.startActivity(switchAccountIntent);
+ return;
+ }
+ }
+
+ AccountManager.getInstance().beginAccountCreation(context);
+ Intent registrationIntent = new Intent(context, RegistrationActivity.class);
+ registrationIntent.putExtra(ACCOUNT_DATA, data);
+ registrationIntent.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK);
+ context.startActivity(registrationIntent);
+ }
+ }
+ }
+
+ private final Messenger messenger = new Messenger(new IncomingHandler(this));
+
+ @Nullable
+ @Override
+ public IBinder onBind(Intent intent) {
+ return messenger.getBinder();
+ }
+
+ @Override
+ public int onStartCommand(Intent intent, int flags, int startId) {
+ return START_NOT_STICKY;
+ }
+}