aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-02-10 17:45:48 +0100
committerChristian Schneppe <christian@pix-art.de>2018-02-10 17:45:48 +0100
commit0f5c0cae1f7e764796e883bf9cc36f0f3f009306 (patch)
treedd9289cd32bfdadc601cf8a40c490629154739c9 /src/main/java
parentb08f674dcce45d4778287263f3a33e4aa2b6330a (diff)
skip animations for startup activities
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationActivity.java18
-rw-r--r--src/main/java/de/pixart/messenger/ui/XmppActivity.java1
2 files changed, 14 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index 975981890..78ab0a91f 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -1286,17 +1286,22 @@ public class ConversationActivity extends XmppActivity
mPostponedActivityResult = null;
}
- private void redirectToStartConversationActivity() {
+ private void redirectToStartConversationActivity(boolean noAnimation) {
Account pendingAccount = xmppConnectionService.getPendingAccount();
if (pendingAccount == null) {
Intent startConversationActivity = new Intent(this, StartConversationActivity.class);
+ startConversationActivity.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ if (noAnimation) {
+ startConversationActivity.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+ }
startConversationActivity.putExtra("init", true);
startActivity(startConversationActivity);
+ if (noAnimation) {
+ overridePendingTransition(0, 0);
+ }
} else {
switchToAccount(pendingAccount, true);
- return;
}
- finish();
}
@Override
@@ -1346,21 +1351,24 @@ public class ConversationActivity extends XmppActivity
Intent redirectionIntent = new Intent(this, ManageAccountActivity.class);
redirectionIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
startActivity(redirectionIntent);
+ overridePendingTransition(0, 0);
} else if (Config.MAGIC_CREATE_DOMAIN != null) {
Log.d(Config.LOGTAG, "First start time: " + FirstStartTime);
Intent redirectionIntent = new Intent(this, WelcomeActivity.class);
redirectionIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
startActivity(redirectionIntent);
+ overridePendingTransition(0, 0);
} else {
Intent editAccount = new Intent(this, EditAccountActivity.class);
editAccount.putExtra("init", true);
editAccount.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
startActivity(editAccount);
+ overridePendingTransition(0, 0);
}
}
} else if (conversationList.size() <= 0) {
if (mRedirected.compareAndSet(false, true)) {
- redirectToStartConversationActivity();
+ redirectToStartConversationActivity(true);
}
} else if (selectConversationByUuid(mOpenConversation)) {
if (mPanelOpen) {
@@ -2172,7 +2180,7 @@ public class ConversationActivity extends XmppActivity
}
} else {
if (!isStopping() && mRedirected.compareAndSet(false, true)) {
- redirectToStartConversationActivity();
+ redirectToStartConversationActivity(false);
}
Log.d(Config.LOGTAG, "not updating conversations fragment because conversations list size was 0");
}
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 48397a75e..21340b425 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -541,6 +541,7 @@ public abstract class XmppActivity extends Activity {
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
}
startActivity(intent);
+ overridePendingTransition(0, 0);
}
protected void delegateUriPermissionsToService(Uri uri) {