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

Use dialog fragment for unexpected errors

Browse Source
This commit is contained in:
M66B
2019-07-01 14:06:15 +02:00
parent b855358169
commit 9f5a829206
32 changed files with 178 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/faircode/email/ActivitySetup.java
View File

@@ -378,7 +378,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
try {
askPassword(true);
} catch (Throwable ex) {
Helper.unexpectedError(this, this, ex);
Helper.unexpectedError(getSupportFragmentManager(), ex);
}
}
@@ -386,7 +386,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
try {
askPassword(false);
} catch (Throwable ex) {
Helper.unexpectedError(this, this, ex);
Helper.unexpectedError(getSupportFragmentManager(), ex);
}
}
@@ -451,7 +451,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(ActivitySetup.this, ActivitySetup.this, ex);
Helper.unexpectedError(getSupportFragmentManager(), ex);
}
}.execute(this, new Bundle(), "cleanup:run");
}
@@ -620,7 +620,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
if (ex instanceof IllegalArgumentException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
else
Helper.unexpectedError(ActivitySetup.this, ActivitySetup.this, ex);
Helper.unexpectedError(getSupportFragmentManager(), ex);
}
}.execute(this, args, "setup:export");
}
@@ -898,7 +898,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
else if (ex instanceof IllegalArgumentException)
Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
else
Helper.unexpectedError(ActivitySetup.this, ActivitySetup.this, ex);
Helper.unexpectedError(getSupportFragmentManager(), ex);
}
}.execute(this, args, "setup:import");
}
@@ -1061,7 +1061,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
else {
if (!export || password1.equals(password2)) {
((ActivitySetup) getActivity()).password = password1;
getActivity().startActivityForResult(
startActivityForResult(
Helper.getChooser(getContext(),
export ? getIntentExport() : getIntentImport()),
export ? REQUEST_EXPORT : REQUEST_IMPORT);