forked from mirror/monocles_chat_clean
Revert "Remove Transitions for little speed improvement"
This reverts commit 562639ee
This commit is contained in:
parent
83def8c4fc
commit
b23c9f1009
22 changed files with 74 additions and 73 deletions
|
@ -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(); }
|
||||
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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();
|
||||
});
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -150,7 +150,7 @@ public class UpdaterActivity extends XmppActivity {
|
|||
List<ResolveInfo> 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();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
|
|
@ -573,7 +573,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
|
|||
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<Message> {
|
|||
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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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(); }
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue