Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-30 21:58:52 +02: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

11
app/src/main/java/eu/faircode/email/FragmentPop.java
View File

@@ -95,6 +95,9 @@ public class FragmentPop extends FragmentBase {
private long id = -1;
private boolean saving = false;
private static final int REQUEST_COLOR = 1;
private static final int REQUEST_DELETE = 2;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -177,7 +180,7 @@ public class FragmentPop extends FragmentBase {
FragmentDialogColor fragment = new FragmentDialogColor();
fragment.setArguments(args);
fragment.setTargetFragment(FragmentPop.this, ActivitySetup.REQUEST_POP_COLOR);
fragment.setTargetFragment(FragmentPop.this, REQUEST_COLOR);
fragment.show(getParentFragmentManager(), "account:color");
}
});
@@ -598,7 +601,7 @@ public class FragmentPop extends FragmentBase {
FragmentDialogAsk fragment = new FragmentDialogAsk();
fragment.setArguments(aargs);
fragment.setTargetFragment(FragmentPop.this, ActivitySetup.REQUEST_POP_DELETE);
fragment.setTargetFragment(FragmentPop.this, REQUEST_DELETE);
fragment.show(getParentFragmentManager(), "account:delete");
}
@@ -608,7 +611,7 @@ public class FragmentPop extends FragmentBase {
try {
switch (requestCode) {
case ActivitySetup.REQUEST_POP_COLOR:
case REQUEST_COLOR:
if (resultCode == RESULT_OK && data != null) {
if (ActivityBilling.isPro(getContext())) {
Bundle args = data.getBundleExtra("args");
@@ -617,7 +620,7 @@ public class FragmentPop extends FragmentBase {
startActivity(new Intent(getContext(), ActivityBilling.class));
}
break;
case ActivitySetup.REQUEST_POP_DELETE:
case REQUEST_DELETE:
if (resultCode == RESULT_OK)
onDelete();
break;