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

Simplifications

Browse Source
This commit is contained in:
M66B
2020-10-30 09:51:59 +01:00
parent 8472d379d3
commit aea6a79019
25 changed files with 229 additions and 160 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

@@ -1254,7 +1254,9 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
final boolean export = getArguments().getBoolean("export");
View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_password, null);
final Context context = getContext();
View dview = LayoutInflater.from(context).inflate(R.layout.dialog_password, null);
etPassword1 = dview.findViewById(R.id.tilPassword1);
etPassword2 = dview.findViewById(R.id.tilPassword2);
TextView tvImportHint = dview.findViewById(R.id.tvImportHint);
@@ -1267,7 +1269,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
etPassword2.setVisibility(export ? View.VISIBLE : View.GONE);
tvImportHint.setVisibility(export ? View.GONE : View.VISIBLE);
return new AlertDialog.Builder(getContext())
return new AlertDialog.Builder(context)
.setView(dview)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
@@ -1276,16 +1278,16 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
String password2 = etPassword2.getEditText().getText().toString();
if (!BuildConfig.DEBUG && TextUtils.isEmpty(password1))
ToastEx.makeText(getContext(), R.string.title_setup_password_missing, Toast.LENGTH_LONG).show();
ToastEx.makeText(context, R.string.title_setup_password_missing, Toast.LENGTH_LONG).show();
else {
if (!export || password1.equals(password2)) {
((ActivitySetup) getActivity()).password = password1;
getActivity().startActivityForResult(
Helper.getChooser(getContext(),
Helper.getChooser(context,
export ? getIntentExport() : getIntentImport()),
export ? REQUEST_EXPORT : REQUEST_IMPORT);
} else
ToastEx.makeText(getContext(), R.string.title_setup_password_different, Toast.LENGTH_LONG).show();
ToastEx.makeText(context, R.string.title_setup_password_different, Toast.LENGTH_LONG).show();
}
}
})