diff --git a/src/git/java/de/monocles/chat/ui/StartUI.java b/src/git/java/de/monocles/chat/ui/StartUI.java index d5aa3a3b5..b7686b1d0 100644 --- a/src/git/java/de/monocles/chat/ui/StartUI.java +++ b/src/git/java/de/monocles/chat/ui/StartUI.java @@ -27,7 +27,7 @@ public class StartUI extends AppCompatActivity { Intent intent = new Intent(this, ConversationsActivity.class); intent.putExtra(PREF_FIRST_START, FirstStartTime); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); finish(); } diff --git a/src/main/java/de/monocles/chat/SignUpPage.java b/src/main/java/de/monocles/chat/SignUpPage.java index 19350c794..045272ca0 100644 --- a/src/main/java/de/monocles/chat/SignUpPage.java +++ b/src/main/java/de/monocles/chat/SignUpPage.java @@ -111,9 +111,9 @@ public class SignUpPage extends RegisterMonoclesActivity { intent.putExtra("existing", true); //addInviteUri(intent); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); finish(); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; default: return super.onOptionsItemSelected(item); diff --git a/src/main/java/de/monocles/chat/ui/CallsActivity.java b/src/main/java/de/monocles/chat/ui/CallsActivity.java index dde90d64d..10a1e0456 100644 --- a/src/main/java/de/monocles/chat/ui/CallsActivity.java +++ b/src/main/java/de/monocles/chat/ui/CallsActivity.java @@ -90,17 +90,17 @@ public class CallsActivity extends XmppActivity { { case R.id.chats: startActivity(new Intent(getApplicationContext(), ConversationsActivity.class)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; case R.id.calls: return true; case R.id.contactslist: startActivity(new Intent(getApplicationContext(),StartConversationActivity.class)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; case R.id.stories: startActivity(new Intent(getApplicationContext(),MediaBrowserActivity.class)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; } return false; @@ -315,7 +315,7 @@ public class CallsActivity extends XmppActivity { intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); System.exit(0); } diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index ac13c6d84..36011d006 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -101,7 +101,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers intent.putExtra("MUC_UUID", mConversation.getUuid()); Log.d(Config.LOGTAG, "Sending DESTROY intent for " + mConversation.getName()); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); deleteBookmark(); finish(); }); @@ -152,7 +152,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers intent.setAction(ConferenceDetailsActivity.ACTION_VIEW_MUC); intent.putExtra("uuid", conversation.getUuid()); activity.startActivity(intent); - + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } private OnClickListener mNotifyStatusClickListener = new OnClickListener() { @@ -767,7 +767,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers LeaveMucDialog.setPositiveButton(getString(R.string.action_end_conversation_muc), (dialog, which) -> { startActivity(new Intent(xmppConnectionService, ConversationsActivity.class)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); this.xmppConnectionService.archiveConversation(mConversation); finish(); }); diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java index 4d2b7c255..bd19acb36 100644 --- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -589,7 +589,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp intent.putExtra("finishActivityOnSaveCompleted", true); try { startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } catch (ActivityNotFoundException e) { ToastCompat.makeText(ContactDetailsActivity.this, R.string.no_application_found_to_view_contact, ToastCompat.LENGTH_SHORT).show(); } diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index e9619c0be..19d59a7ab 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -648,7 +648,7 @@ public class ConversationFragment extends XmppFragment intent.putExtra(VerifyOTRActivity.EXTRA_ACCOUNT, conversation.getAccount().getJid().asBareJid().toString()); intent.putExtra("mode", VerifyOTRActivity.MODE_ANSWER_QUESTION); startActivity(intent); - + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } }; @@ -2605,7 +2605,7 @@ public class ConversationFragment extends XmppFragment Intent intent1 = new Intent(activity, MucUsersActivity.class); intent1.putExtra("uuid", conversation.getUuid()); startActivity(intent1); - + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } else if (itemId == R.id.action_contact_details) { activity.switchToContactDetails(conversation.getContact()); } else if (itemId == R.id.action_mediabrowser) { @@ -3301,10 +3301,10 @@ public class ConversationFragment extends XmppFragment startActivityForResult( Intent.createChooser(intent, getString(R.string.perform_action_with)), attachmentChoice); - + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } else { startActivityForResult(intent, attachmentChoice); - + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } } catch (final ActivityNotFoundException e) { @@ -4355,7 +4355,7 @@ public class ConversationFragment extends XmppFragment intent.setAction(ConferenceDetailsActivity.ACTION_VIEW_MUC); intent.putExtra("uuid", conversation.getUuid()); startActivity(intent); - + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java index 1ec3f3b97..4460e30bf 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java @@ -251,7 +251,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio restartintent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); restartintent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(restartintent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); System.exit(0); } } @@ -309,7 +309,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio } runOnUiThread(() -> { startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); if (noAnimation) { overridePendingTransition(0, 0); } @@ -1001,22 +1001,22 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio } case R.id.contactslist -> { startActivity(new Intent(getApplicationContext(), StartConversationActivity.class)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; } case R.id.manageaccounts -> { startActivity(new Intent(getApplicationContext(), MANAGE_ACCOUNT_ACTIVITY)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; } /* TODO: case R.id.calls: startActivity(new Intent(getApplicationContext(), CallsActivity.class)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; case R.id.stories: startActivity(new Intent(getApplicationContext(),MediaBrowserActivity.class)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; */ default -> @@ -1260,7 +1260,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio break; } startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; }); popup.show(); diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java index 40b185195..e901b7d3d 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java @@ -478,7 +478,7 @@ public class ConversationsOverviewFragment extends XmppFragment { switch (item.getItemId()) { case R.id.action_search: startActivity(new Intent(getActivity(), SearchActivity.class)); - + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; } return super.onOptionsItemSelected(item); diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index 7c1ce00cc..85a89b38b 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -340,7 +340,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat Intent intent = new Intent(this, StartConversationActivity.class); StartConversationActivity.addInviteUri(intent, getIntent()); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); finish(); } else if (mInitMode && mAccount != null && mAccount.getStatus() == Account.State.ONLINE) { runOnUiThread(this::next); @@ -357,7 +357,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat intent.putExtra(EXTRA_ACCOUNT, mAccount.getJid().asBareJid().toString()); intent.putExtra("existing", mExisting); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); finish(); } } @@ -400,7 +400,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat Intent intent = SignupUtils.getSignUpIntent(this, mForceRegister != null && mForceRegister); StartConversationActivity.addInviteUri(intent, getIntent()); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } } @@ -482,7 +482,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat final Intent intent = new Intent(getApplicationContext(), PublishProfilePictureActivity.class); intent.putExtra(EXTRA_ACCOUNT, mAccount.getJid().asBareJid().toEscapedString()); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } } }; @@ -507,7 +507,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat } StartConversationActivity.addInviteUri(intent, getIntent()); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); finish(); }); } @@ -1022,7 +1022,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat if (hasStoragePermission(REQUEST_IMPORT_BACKUP)) { startActivity(new Intent(this, ImportBackupActivity.class)); } - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); break; case R.id.action_add_account_with_cert: addAccountFromKey(); @@ -1053,7 +1053,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat final Intent showBlocklistIntent = new Intent(this, BlocklistActivity.class); showBlocklistIntent.putExtra(EXTRA_ACCOUNT, mAccount.getJid().toEscapedString()); startActivity(showBlocklistIntent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); break; case R.id.action_server_info_show_more: changeMoreTableVisibility(!item.isChecked()); @@ -1163,7 +1163,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat } this.newPassword = null; startActivity(changePasswordIntent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } private void renewCertificate() { diff --git a/src/main/java/eu/siacs/conversations/ui/EnterNameActivity.java b/src/main/java/eu/siacs/conversations/ui/EnterNameActivity.java index 23987e8fb..71da59122 100644 --- a/src/main/java/eu/siacs/conversations/ui/EnterNameActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EnterNameActivity.java @@ -65,13 +65,13 @@ public class EnterNameActivity extends XmppActivity implements XmppConnectionSer Intent intent = new Intent(this, SetSettingsActivity.class); intent.putExtra("setup", true); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } else { Intent intent = new Intent(this, PublishProfilePictureActivity.class); intent.putExtra(PublishProfilePictureActivity.EXTRA_ACCOUNT, account.getJid().asBareJid().toEscapedString()); intent.putExtra("setup", true); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } } finish(); @@ -88,7 +88,7 @@ public class EnterNameActivity extends XmppActivity implements XmppConnectionSer StartConversationActivity.addInviteUri(intent, getIntent()); intent.putExtra(EXTRA_ACCOUNT, account.getJid().asBareJid().toEscapedString()); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); finish(); } finish(); diff --git a/src/main/java/eu/siacs/conversations/ui/ImportBackupActivity.java b/src/main/java/eu/siacs/conversations/ui/ImportBackupActivity.java index 6d8443813..13a89a7e5 100644 --- a/src/main/java/eu/siacs/conversations/ui/ImportBackupActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ImportBackupActivity.java @@ -341,7 +341,7 @@ public class ImportBackupActivity extends XmppActivity implements ServiceConnect intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); System.exit(0); } diff --git a/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java b/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java index 0fadc3d3d..ac19d0456 100644 --- a/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java @@ -188,9 +188,9 @@ public class MagicCreateActivity extends XmppActivity implements TextWatcher, Ad if (copyTextToClipboard(password, R.string.create_account)) { StartConversationActivity.addInviteUri(intent, getIntent()); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); finish(); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } }); builder.create().show(); diff --git a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java index 3055a35c8..dc908ae82 100644 --- a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -171,12 +171,12 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda switch (item.getItemId()) { case R.id.chats -> { startActivity(new Intent(getApplicationContext(), ConversationsActivity.class)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; } case R.id.contactslist -> { startActivity(new Intent(getApplicationContext(), StartConversationActivity.class)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; } case R.id.manageaccounts -> { @@ -185,11 +185,11 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda /* TODO: case R.id.calls: startActivity(new Intent(getApplicationContext(), CallsActivity.class)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; case R.id.stories: startActivity(new Intent(getApplicationContext(),MediaBrowserActivity.class)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; */ default -> @@ -280,13 +280,13 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda switch (item.getItemId()) { case R.id.action_add_account: startActivity(new Intent(this, EditAccountActivity.class)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); break; case R.id.action_import_backup: if (hasStoragePermission(REQUEST_IMPORT_BACKUP)) { startActivity(new Intent(this, ImportBackupActivity.class)); } - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); break; case R.id.action_create_backup: if (hasStoragePermission(REQUEST_CREATE_BACKUP)) { @@ -400,7 +400,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda PublishProfilePictureActivity.class); intent.putExtra(EXTRA_ACCOUNT, account.getJid().asBareJid().toEscapedString()); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } //TODO: disable and enable all accounts function @@ -548,7 +548,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda intent.putExtra("jid", account.getJid().asBareJid().toString()); intent.putExtra("init", true); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } @Override diff --git a/src/main/java/eu/siacs/conversations/ui/ScanActivity.java b/src/main/java/eu/siacs/conversations/ui/ScanActivity.java index ab3a0489f..32b374d34 100644 --- a/src/main/java/eu/siacs/conversations/ui/ScanActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ScanActivity.java @@ -276,7 +276,7 @@ public final class ScanActivity extends Activity implements SurfaceTextureListen if (ContextCompat.checkSelfPermission(activity, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) { Intent intent = new Intent(activity, ScanActivity.class); activity.startActivityForResult(intent, REQUEST_SCAN_QR_CODE); - + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } else { ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.CAMERA}, REQUEST_CAMERA_PERMISSIONS_TO_SCAN); } diff --git a/src/main/java/eu/siacs/conversations/ui/SetSettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SetSettingsActivity.java index 641161529..f2f55d8b0 100644 --- a/src/main/java/eu/siacs/conversations/ui/SetSettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SetSettingsActivity.java @@ -99,7 +99,7 @@ public class SetSettingsActivity extends XmppActivity implements XmppConnectionS intent.putExtra(PublishProfilePictureActivity.EXTRA_ACCOUNT, account.getJid().asBareJid().toEscapedString()); intent.putExtra("setup", true); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } finish(); } diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index 3e8fa72bb..bd892f6d9 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -463,7 +463,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne switch (item.getItemId()) { case R.id.chats -> { startActivity(new Intent(getApplicationContext(), ConversationsActivity.class)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; } case R.id.contactslist -> { @@ -471,17 +471,17 @@ public class StartConversationActivity extends XmppActivity implements XmppConne } case R.id.manageaccounts -> { startActivity(new Intent(getApplicationContext(), MANAGE_ACCOUNT_ACTIVITY)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; } /* TODO: case R.id.calls: startActivity(new Intent(getApplicationContext(), CallsActivity.class)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; case R.id.stories: startActivity(new Intent(getApplicationContext(),MediaBrowserActivity.class)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return true; */ default -> @@ -1413,7 +1413,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne intent.putExtra(ChooseContactActivity.EXTRA_ACCOUNT, account.getJid().asBareJid().toEscapedString()); intent.putExtra(ChooseContactActivity.EXTRA_TITLE_RES_ID, R.string.choose_participants); startActivityForResult(intent, REQUEST_CREATE_CONFERENCE); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } @Override diff --git a/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java b/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java index fc1907caa..29fce2a34 100644 --- a/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java @@ -150,7 +150,7 @@ public class UpdaterActivity extends XmppActivity { List infos = manager.queryIntentActivities(marketIntent, 0); if (infos.size() > 0) { startActivity(marketIntent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } else { uri = Uri.parse("https://" + monocles()); try { @@ -436,7 +436,7 @@ public class UpdaterActivity extends XmppActivity { installIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); installIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); startActivity(installIntent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); UpdaterActivity.this.finish(); } } diff --git a/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java b/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java index d50abc67b..5c28c4c60 100644 --- a/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java @@ -164,9 +164,9 @@ public class WelcomeActivity extends XmppActivity implements XmppConnectionServi intent.putExtra("existing", true); addInviteUri(intent); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); finish(); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); }); } @@ -185,6 +185,7 @@ public class WelcomeActivity extends XmppActivity implements XmppConnectionServi Intent intent = new Intent(activity, WelcomeActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); activity.startActivity(intent); + activity.overridePendingTransition(0, 0); } @Override diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index 1b0b0abcc..a46d8958b 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -429,7 +429,7 @@ public abstract class XmppActivity extends ActionBarActivity { switch (item.getItemId()) { case R.id.action_settings: startActivity(new Intent(this, SettingsActivity.class)); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); break; case R.id.action_accounts: if (xmppConnectionServiceBound && this.xmppConnectionService.getAccounts().size() == 1 && !this.xmppConnectionService.multipleAccounts()) { @@ -438,10 +438,10 @@ public abstract class XmppActivity extends ActionBarActivity { intent.putExtra("jid", mAccount.getJid().asBareJid().toString()); intent.putExtra("init", false); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } else { AccountUtils.launchManageAccounts(this); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } break; case android.R.id.home: @@ -680,7 +680,7 @@ public abstract class XmppActivity extends ActionBarActivity { intent.putExtra(ConversationsActivity.EXTRA_POST_INIT_ACTION, postInit); intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_CLEAR_TOP); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); finish(); } public void switchToMUCDetails(Conversation conversation) { @@ -688,7 +688,7 @@ public abstract class XmppActivity extends ActionBarActivity { intent.setAction(ConferenceDetailsActivity.ACTION_VIEW_MUC); intent.putExtra("uuid", conversation.getUuid()); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } public void switchToContactDetails(Contact contact) { @@ -702,7 +702,7 @@ public abstract class XmppActivity extends ActionBarActivity { intent.putExtra("contact", contact.getJid().toEscapedString()); intent.putExtra("fingerprint", messageFingerprint); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } public void switchToMucContactDetails(MucOptions.User user) { @@ -711,7 +711,7 @@ public abstract class XmppActivity extends ActionBarActivity { intent.putExtra(EXTRA_ACCOUNT, user.getAccount().getJid().asBareJid().toEscapedString()); intent.putExtra("user", user.getFullJid().toEscapedString()); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } public void switchToAccount(Account account, String fingerprint) { @@ -733,7 +733,7 @@ public abstract class XmppActivity extends ActionBarActivity { intent.putExtra("fingerprint", fingerprint); } startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); if (init) { overridePendingTransition(0, 0); } @@ -1112,7 +1112,7 @@ public abstract class XmppActivity extends ActionBarActivity { intent.putExtra(Intent.EXTRA_SUBJECT, user + " " + getString(R.string.inviteUser_Subject) + " " + getString(R.string.app_name)); intent.putExtra(Intent.EXTRA_TEXT, inviteText + "\n\n" + inviteURL); startActivity(Intent.createChooser(intent, getString(R.string.invite_contact))); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } else { final AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(R.string.chooce_account); @@ -1156,7 +1156,7 @@ public abstract class XmppActivity extends ActionBarActivity { intent.putExtra(Intent.EXTRA_SUBJECT, user + " " + getString(R.string.inviteUser_Subject) + " " + getString(R.string.app_name)); intent.putExtra(Intent.EXTRA_TEXT, inviteText + "\n\n" + inviteURL); startActivity(Intent.createChooser(intent, getString(R.string.invite_contact))); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); }); builder.setNegativeButton(R.string.cancel, null); builder.create().show(); @@ -1239,7 +1239,7 @@ public abstract class XmppActivity extends ActionBarActivity { Intent intent = new Intent(Intent.ACTION_VIEW); intent.setData(Uri.parse(IssueURL)); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } protected void shareLink(boolean http) { @@ -1252,7 +1252,7 @@ public abstract class XmppActivity extends ActionBarActivity { intent.putExtra(Intent.EXTRA_TEXT, getShareableUri(http)); try { startActivity(Intent.createChooser(intent, getText(R.string.share_uri_with))); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } catch (ActivityNotFoundException e) { ToastCompat.makeText(this, R.string.no_application_to_share_uri, ToastCompat.LENGTH_SHORT).show(); } diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 04ba4189b..3e0fa4f35 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -573,7 +573,7 @@ public class MessageAdapter extends ArrayAdapter { Intent intent = new Intent(Intent.ACTION_VIEW); intent.setData(Uri.parse(body)); activity.startActivity(intent); - + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } catch (Exception e) { ToastCompat.makeText(activity, R.string.no_application_found_to_view_contact, ToastCompat.LENGTH_LONG).show(); } @@ -2013,7 +2013,7 @@ public class MessageAdapter extends ArrayAdapter { for (Intent intent : GeoHelper.createGeoIntentsFromMessage(this.getContext(), message)) { if (intent.resolveActivity(getContext().getPackageManager()) != null) { getContext().startActivity(intent); - + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); return; } } diff --git a/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java b/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java index 69709c4d1..9ffc1aa2a 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java +++ b/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java @@ -83,7 +83,7 @@ public class ShareUtil { } try { activity.startActivity(Intent.createChooser(shareIntent, activity.getText(R.string.share_with))); - + activity.overridePendingTransition(R.animator.fade_in, R.animator.fade_out); } catch (ActivityNotFoundException e) { //This should happen only on faulty androids because normally chooser is always available ToastCompat.makeText(activity, R.string.no_application_found_to_open_file, ToastCompat.LENGTH_SHORT).show(); diff --git a/src/playstore/java/de/monocles/chat/StartUI.java b/src/playstore/java/de/monocles/chat/StartUI.java index d3b136185..669bd9c6a 100644 --- a/src/playstore/java/de/monocles/chat/StartUI.java +++ b/src/playstore/java/de/monocles/chat/StartUI.java @@ -27,7 +27,7 @@ public class StartUI extends AppCompatActivity { Intent intent = new Intent(this, ConversationsActivity.class); intent.putExtra(PREF_FIRST_START, FirstStartTime); startActivity(intent); - + overridePendingTransition(R.animator.fade_in, R.animator.fade_out); finish(); }