narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

no WelcomeActivity if MAGIC_CREATE_DOMAIN is unset

Browse source
This commit is contained in:
Christoph Scholz 2018-04-06 15:42:45 +02:00 committed by Daniel Gultsch
parent 182b76eae7
commit 816b5bae58
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View file

@ -312,7 +312,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
xmppConnectionService.deleteAccount(mAccount); xmppConnectionService.deleteAccount(mAccount);
} }
if (xmppConnectionService.getAccounts().size() == 0) { if (xmppConnectionService.getAccounts().size() == 0 && Config.MAGIC_CREATE_DOMAIN != null) {
Intent intent = new Intent(EditAccountActivity.this, WelcomeActivity.class); Intent intent = new Intent(EditAccountActivity.this, WelcomeActivity.class);
WelcomeActivity.addInviteUri(intent, getIntent()); WelcomeActivity.addInviteUri(intent, getIntent());
startActivity(intent); startActivity(intent);

3
src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java
View file

@ -13,6 +13,7 @@ import android.widget.Toast;
import java.util.List; import java.util.List;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.R; import eu.siacs.conversations.R;
import eu.siacs.conversations.persistance.DatabaseBackend; import eu.siacs.conversations.persistance.DatabaseBackend;
import eu.siacs.conversations.utils.XmppUri; import eu.siacs.conversations.utils.XmppUri;
@ -89,7 +90,7 @@ public class UriHandlerActivity extends AppCompatActivity {
return; return;
} }
if (accounts.size() == 0) { if (accounts.size() == 0 && Config.MAGIC_CREATE_DOMAIN != null) {
intent = new Intent(getApplicationContext(), WelcomeActivity.class); intent = new Intent(getApplicationContext(), WelcomeActivity.class);
WelcomeActivity.addInviteUri(intent, xmppUri); WelcomeActivity.addInviteUri(intent, xmppUri);
startActivity(intent); startActivity(intent);