diff options
Diffstat (limited to 'src')
4 files changed, 11 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java index 30c54990f..9c9949770 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java @@ -559,7 +559,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio return true; case R.id.action_check_updates: if (xmppConnectionService.hasInternetConnection()) { - if (!installFromUnknownSourceAllowed() && !xmppConnectionService.installedFrom().equals(PlayStore)) { + if (!installFromUnknownSourceAllowed() && (xmppConnectionService.installedFrom() != null && !xmppConnectionService.installedFrom().equals(PlayStore))) { openInstallFromUnknownSourcesDialogIfNeeded(); } else { UpdateService task = new UpdateService(this, xmppConnectionService.installedFrom(), xmppConnectionService); diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java index e33de0eb4..9d38923da 100644 --- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java +++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java @@ -432,7 +432,8 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat protected void updateInfoButtons() { if (this.binding.accountRegisterNew.isChecked() && this.binding.accountJid.getText().length() > 0 && !this.binding.accountJid.getText().toString().contains("@")) { - if (!mUsernameMode && Jid.of(this.binding.accountJid.getText()).getDomain().toLowerCase().equals("pix-art.de")) { + final String jid = this.binding.accountJid.getText().toString(); + if (!mUsernameMode && Jid.of(jid).getDomain().toLowerCase().equals("pix-art.de")) { this.binding.showPrivacyPolicy.setVisibility(View.VISIBLE); this.binding.showTermsOfUse.setVisibility(View.VISIBLE); } diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java index a58c2e0c0..4e02df3ea 100644 --- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java @@ -463,6 +463,12 @@ public class StartConversationActivity extends XmppActivity implements XmppConne if (prev != null) { ft.remove(prev); } + boolean multiAccount = false; + try { + multiAccount = xmppConnectionService.multipleAccounts(); + } catch (Exception e) { + e.printStackTrace(); + } ft.addToBackStack(null); EnterJidDialog dialog = EnterJidDialog.newInstance( mActivatedAccounts, @@ -471,7 +477,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne prefilledJid, null, invite == null || !invite.hasFingerprints(), - xmppConnectionService.multipleAccounts() + multiAccount ); dialog.setOnEnterJidDialogPositiveListener((accountJid, contactJid) -> { diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index 29a256afb..98509a48e 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -113,6 +113,7 @@ <item>pix-art.de</item> <item>conversations.im</item> <item>jabber.cat</item> + <item>jabbers.one</item> <item>jabjab.de</item> <item>im.koderoot.net</item> <item>riotcat.org</item> |