mirror of
https://github.com/M66B/FairEmail.git
synced 2024-12-27 02:07:12 +00:00
Check SAF before export/import
This commit is contained in:
parent
6aac7cfa2e
commit
c24ebe7381
1 changed files with 19 additions and 17 deletions
|
@ -373,31 +373,33 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onMenuExport() {
|
private void onMenuExport() {
|
||||||
if (ActivityBilling.isPro(this)) {
|
if (ActivityBilling.isPro(this))
|
||||||
try {
|
|
||||||
askPassword(true);
|
askPassword(true);
|
||||||
} catch (Throwable ex) {
|
else
|
||||||
Helper.unexpectedError(getSupportFragmentManager(), ex);
|
|
||||||
}
|
|
||||||
} else
|
|
||||||
startActivity(new Intent(this, ActivityBilling.class));
|
startActivity(new Intent(this, ActivityBilling.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onMenuImport() {
|
private void onMenuImport() {
|
||||||
try {
|
|
||||||
askPassword(false);
|
askPassword(false);
|
||||||
} catch (Throwable ex) {
|
|
||||||
Helper.unexpectedError(getSupportFragmentManager(), ex);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void askPassword(final boolean export) {
|
private void askPassword(final boolean export) {
|
||||||
|
Intent intent = (export ? getIntentExport() : getIntentImport());
|
||||||
|
if (intent.resolveActivity(getPackageManager()) == null) {
|
||||||
|
ToastEx.makeText(this, R.string.title_no_saf, Toast.LENGTH_LONG).show();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
Bundle args = new Bundle();
|
Bundle args = new Bundle();
|
||||||
args.putBoolean("export", export);
|
args.putBoolean("export", export);
|
||||||
|
|
||||||
FragmentDialogPassword fragment = new FragmentDialogPassword();
|
FragmentDialogPassword fragment = new FragmentDialogPassword();
|
||||||
fragment.setArguments(args);
|
fragment.setArguments(args);
|
||||||
fragment.show(getSupportFragmentManager(), "password");
|
fragment.show(getSupportFragmentManager(), "password");
|
||||||
|
} catch (Throwable ex) {
|
||||||
|
Helper.unexpectedError(getSupportFragmentManager(), ex);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void onMenuOrder(int title, Class clazz) {
|
private void onMenuOrder(int title, Class clazz) {
|
||||||
|
|
Loading…
Reference in a new issue