aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/java/de/pixart/messenger/services/XmppConnectionService.java15
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationActivity.java64
-rw-r--r--src/main/java/de/pixart/messenger/ui/WelcomeActivity.java2
3 files changed, 78 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 2c2f0b2d4..5353e003c 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -1836,6 +1836,19 @@ public class XmppConnectionService extends Service {
return null;
}
+ public boolean isConversationsListEmpty(final Conversation ignore) {
+ synchronized (this.conversations) {
+ final int size = this.conversations.size();
+ if (size == 0) {
+ return true;
+ } else if (size == 1) {
+ return this.conversations.get(0) == ignore;
+ } else {
+ return false;
+ }
+ }
+ }
+
public Conversation findOrCreateConversation(Account account, Jid jid, boolean muc, final boolean async) {
return this.findOrCreateConversation(account, jid, muc, false, async);
}
@@ -4131,7 +4144,7 @@ public class XmppConnectionService extends Service {
public Account getPendingAccount() {
Account pending = null;
for (Account account : getAccounts()) {
- if (account.isOptionSet(Account.OPTION_REGISTER)) {
+ if (!account.isOptionSet(Account.OPTION_LOGGED_IN_SUCCESSFULLY)) {
pending = account;
} else {
return null;
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index 458fb4bf4..9d023f235 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -47,9 +47,12 @@ import android.widget.Toast;
import net.java.otr4j.session.SessionStatus;
+import java.util.concurrent.atomic.AtomicBoolean;
+
import de.pixart.messenger.Config;
import de.pixart.messenger.R;
import de.pixart.messenger.databinding.ActivityConversationsBinding;
+import de.pixart.messenger.entities.Account;
import de.pixart.messenger.entities.Conversation;
import de.pixart.messenger.services.EmojiService;
import de.pixart.messenger.services.XmppConnectionService;
@@ -77,6 +80,7 @@ public class ConversationActivity extends XmppActivity implements OnConversation
private final PendingItem<Intent> pendingViewIntent = new PendingItem<>();
private ActivityConversationsBinding binding;
private boolean mActivityPaused = true;
+ private AtomicBoolean mRedirectInProcess = new AtomicBoolean(false);
private static boolean isViewIntent(Intent i) {
return i != null && ACTION_VIEW_CONVERSATION.equals(i.getAction()) && i.hasExtra(EXTRA_CONVERSATION);
@@ -98,6 +102,9 @@ public class ConversationActivity extends XmppActivity implements OnConversation
@Override
void onBackendConnected() {
+ if (performRedirectIfNecessary(true)) {
+ return;
+ }
for (@IdRes int id : FRAGMENT_ID_NOTIFICATION_ORDER) {
notifyFragmentOfBackendConnected(id);
}
@@ -117,6 +124,55 @@ public class ConversationActivity extends XmppActivity implements OnConversation
}
}
+ private boolean performRedirectIfNecessary(boolean noAnimation) {
+ return performRedirectIfNecessary(null, noAnimation);
+ }
+
+ private boolean performRedirectIfNecessary(final Conversation ignore, final boolean noAnimation) {
+ if (xmppConnectionService == null) {
+ return false;
+ }
+ boolean isConversationsListEmpty = xmppConnectionService.isConversationsListEmpty(ignore);
+ if (isConversationsListEmpty && mRedirectInProcess.compareAndSet(false, true)) {
+ final Intent intent = getRedirectionIntent(noAnimation);
+ runOnUiThread(() -> {
+ startActivity(intent);
+ if (noAnimation) {
+ overridePendingTransition(0, 0);
+ }
+ });
+ }
+ 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().toBareJid().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 notifyFragmentOfBackendConnected(@IdRes int id) {
final Fragment fragment = getFragmentManager().findFragmentById(id);
if (fragment != null && fragment instanceof XmppFragment) {
@@ -215,6 +271,7 @@ public class ConversationActivity extends XmppActivity implements OnConversation
if (this.mTheme != theme) {
recreate();
}
+ mRedirectInProcess.set(false);
super.onStart();
}
@@ -341,7 +398,9 @@ public class ConversationActivity extends XmppActivity implements OnConversation
@Override
public void onConversationArchived(Conversation conversation) {
- //TODO; check if nothing more left;
+ if (performRedirectIfNecessary(conversation, false)) {
+ return;
+ }
Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
if (mainFragment != null && mainFragment instanceof ConversationFragment) {
getFragmentManager().popBackStack();
@@ -381,6 +440,9 @@ public class ConversationActivity extends XmppActivity implements OnConversation
@Override
public void onConversationUpdate() {
+ if (performRedirectIfNecessary(false)) {
+ return;
+ }
this.refreshUi();
}
diff --git a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
index 0c02183c6..26a4c0899 100644
--- a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
@@ -338,7 +338,7 @@ public class WelcomeActivity extends XmppActivity {
public static void launch(AppCompatActivity activity) {
Intent intent = new Intent(activity, WelcomeActivity.class);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
activity.startActivity(intent);
activity.overridePendingTransition(0, 0);
}