Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-30 17:40:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Refactoring"

Browse Source 
This reverts commit 0d8ba072f2.
This commit is contained in:
M66B
2020-03-11 12:30:23 +01:00
parent 1818685eee
commit a4b48591fc
4 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/FragmentAccount.java
View File

@@ -162,6 +162,10 @@ public class FragmentAccount extends FragmentBase {
private String certificate = null;
private boolean saving = false;
private static final int REQUEST_COLOR = 1;
private static final int REQUEST_SAVE = 2;
private static final int REQUEST_DELETE = 3;
static final Long SWIPE_ACTION_ASK = -1L;
static final Long SWIPE_ACTION_SEEN = -2L;
static final Long SWIPE_ACTION_SNOOZE = -3L;
@@ -394,7 +398,7 @@ public class FragmentAccount extends FragmentBase {
FragmentDialogColor fragment = new FragmentDialogColor();
fragment.setArguments(args);
fragment.setTargetFragment(FragmentAccount.this, ActivitySetup.REQUEST_ACCOUNT_COLOR);
fragment.setTargetFragment(FragmentAccount.this, REQUEST_COLOR);
fragment.show(getParentFragmentManager(), "account:color");
}
});
@@ -1236,7 +1240,7 @@ public class FragmentAccount extends FragmentBase {
FragmentDialogAsk fragment = new FragmentDialogAsk();
fragment.setArguments(aargs);
fragment.setTargetFragment(FragmentAccount.this, ActivitySetup.REQUEST_ACCOUNT_SAVE);
fragment.setTargetFragment(FragmentAccount.this, REQUEST_SAVE);
fragment.show(getParentFragmentManager(), "account:save");
} else if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) {
getParentFragmentManager().popBackStack();
@@ -1569,7 +1573,7 @@ public class FragmentAccount extends FragmentBase {
FragmentDialogAsk fragment = new FragmentDialogAsk();
fragment.setArguments(aargs);
fragment.setTargetFragment(FragmentAccount.this, ActivitySetup.REQUEST_ACCOUNT_DELETE);
fragment.setTargetFragment(FragmentAccount.this, REQUEST_DELETE);
fragment.show(getParentFragmentManager(), "account:delete");
}
@@ -1579,7 +1583,7 @@ public class FragmentAccount extends FragmentBase {
try {
switch (requestCode) {
case ActivitySetup.REQUEST_ACCOUNT_COLOR:
case REQUEST_COLOR:
if (resultCode == RESULT_OK && data != null) {
if (ActivityBilling.isPro(getContext())) {
Bundle args = data.getBundleExtra("args");
@@ -1588,7 +1592,7 @@ public class FragmentAccount extends FragmentBase {
startActivity(new Intent(getContext(), ActivityBilling.class));
}
break;
case ActivitySetup.REQUEST_ACCOUNT_SAVE:
case REQUEST_SAVE:
if (resultCode == RESULT_OK) {
final boolean save = (btnSave.getVisibility() == View.VISIBLE);
new Handler().post(new Runnable() {
@@ -1604,7 +1608,7 @@ public class FragmentAccount extends FragmentBase {
} else if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
getParentFragmentManager().popBackStack();
break;
case ActivitySetup.REQUEST_ACCOUNT_DELETE:
case REQUEST_DELETE:
if (resultCode == RESULT_OK)
onDelete();
break;