aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian.schneppe@pix-art.de>2019-11-15 21:53:21 +0100
committerChristian Schneppe <christian.schneppe@pix-art.de>2019-11-15 21:53:21 +0100
commit449f09c9754a0a29c52db2c7c7fa46f4c1392427 (patch)
treedc7a0f6878954d21c38d31c6be3b2598c153ab38 /src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
parent78c85da03cb0c8336db9b910fae3c499ebae5f0a (diff)
fix duplicate accounts in EnterJidDialog
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/StartConversationActivity.java')
-rw-r--r--src/main/java/de/pixart/messenger/ui/StartConversationActivity.java14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index 4cfd752b6..cabdfc8fa 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -51,7 +51,6 @@ import androidx.viewpager.widget.ViewPager;
import com.google.android.material.textfield.TextInputLayout;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -215,9 +214,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
spinner.setAdapter(adapter);
spinner.setEnabled(true);
} else {
- ArrayAdapter<String> adapter = new ArrayAdapter<>(context,
- R.layout.simple_list_item,
- Arrays.asList(context.getString(R.string.no_accounts)));
+ ArrayAdapter<String> adapter = new ArrayAdapter<>(context, R.layout.simple_list_item, Collections.singletonList(context.getString(R.string.no_accounts)));
adapter.setDropDownViewResource(R.layout.simple_list_item);
spinner.setAdapter(adapter);
spinner.setEnabled(false);
@@ -776,15 +773,6 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
this.mPostponedActivityResult = null;
}
this.mActivatedAccounts.addAll(AccountUtils.getEnabledAccounts(xmppConnectionService));
- for (Account account : xmppConnectionService.getAccounts()) {
- if (account.getStatus() != Account.State.DISABLED) {
- if (Config.DOMAIN_LOCK != null) {
- this.mActivatedAccounts.add(account.getJid().getLocal());
- } else {
- this.mActivatedAccounts.add(account.getJid().asBareJid().toString());
- }
- }
- }
configureHomeButton();
Intent intent = pendingViewIntent.pop();
if (intent != null && processViewIntent(intent)) {