Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-04 08:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevent crash

Browse Source
This commit is contained in:
M66B
2020-10-30 10:36:16 +01:00
parent aea6a79019
commit 3c8c9da858
27 changed files with 133697 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@@ -5927,10 +5927,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
_title = null;
final String title = _title;
final Context context = getContext();
// Preload web view
Helper.customTabsWarmup(context);
Helper.customTabsWarmup(getContext());
// Process link
final Uri sanitized;
@@ -5949,7 +5947,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
uriTitle = null;
// Get views
final View dview = LayoutInflater.from(context).inflate(R.layout.dialog_open_link, null);
final View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_open_link, null);
final TextView tvTitle = dview.findViewById(R.id.tvTitle);
final ImageButton ibDifferent = dview.findViewById(R.id.ibDifferent);
final EditText etLink = dview.findViewById(R.id.etLink);
@@ -5968,7 +5966,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
final Group grpDifferent = dview.findViewById(R.id.grpDifferent);
final Group grpOwner = dview.findViewById(R.id.grpOwner);
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
ibDifferent.setOnClickListener(new View.OnClickListener() {
@Override
@@ -6000,7 +5998,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
cbSecure.setText(
secure ? R.string.title_link_https : R.string.title_link_http);
cbSecure.setTextColor(Helper.resolveColor(context,
cbSecure.setTextColor(Helper.resolveColor(getContext(),
secure ? android.R.attr.textColorSecondary : R.attr.colorWarning));
cbSecure.setTypeface(
secure ? Typeface.DEFAULT : Typeface.DEFAULT_BOLD);
@@ -6037,12 +6035,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override
public void onClick(View v) {
ClipboardManager clipboard =
(ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
(ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
if (clipboard != null) {
ClipData clip = ClipData.newPlainText(title, etLink.getText().toString());
clipboard.setPrimaryClip(clip);
ToastEx.makeText(context, R.string.title_clipboard_copied, Toast.LENGTH_LONG).show();
ToastEx.makeText(getContext(), R.string.title_clipboard_copied, Toast.LENGTH_LONG).show();
}
}
});
@@ -6076,7 +6074,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
});
tvOwnerRemark.setMovementMethod(LinkMovementMethod.getInstance());
cbNotAgain.setText(context.getString(R.string.title_no_ask_for_again, uri.getHost()));
cbNotAgain.setText(getContext().getString(R.string.title_no_ask_for_again, uri.getHost()));
cbNotAgain.setVisibility(
"https".equals(uri.getScheme()) && !TextUtils.isEmpty(uri.getHost())
? View.VISIBLE : View.GONE);
@@ -6148,6 +6146,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvDisconnect.setVisibility(categories == null ? View.GONE : View.VISIBLE);
tvDisconnectCategories.setVisibility(categories == null ? View.GONE : View.VISIBLE);
final Context context = getContext();
return new AlertDialog.Builder(context)
.setView(dview)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@@ -6265,9 +6265,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
final String type = args.getString("type");
final String from = args.getString("from");
final Context context = getContext();
View view = LayoutInflater.from(context).inflate(R.layout.dialog_junk, null);
View view = LayoutInflater.from(getContext()).inflate(R.layout.dialog_junk, null);
final TextView tvMessage = view.findViewById(R.id.tvMessage);
final ImageButton ibInfo = view.findViewById(R.id.ibInfo);
final CheckBox cbBlockSender = view.findViewById(R.id.cbBlockSender);
@@ -6279,11 +6277,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibInfo.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Helper.viewFAQ(context, 92);
Helper.viewFAQ(getContext(), 92);
}
});
cbBlockSender.setEnabled(ActivityBilling.isPro(context));
cbBlockSender.setEnabled(ActivityBilling.isPro(getContext()));
cbBlockDomain.setEnabled(false);
cbBlockSender.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -6296,7 +6294,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
btnEditRules.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
lbm.sendBroadcast(
new Intent(ActivityView.ACTION_EDIT_RULES)
.putExtra("account", account)
@@ -6307,7 +6305,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
});
return new AlertDialog.Builder(context)
return new AlertDialog.Builder(getContext())
.setView(view)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
@@ -6328,24 +6326,22 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
final long id = getArguments().getLong("id");
final Context context = getContext();
final View dview = LayoutInflater.from(context).inflate(R.layout.dialog_keyword_manage, null);
final View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_keyword_manage, null);
final RecyclerView rvKeyword = dview.findViewById(R.id.rvKeyword);
final TextView tvPro = dview.findViewById(R.id.tvPro);
final FloatingActionButton fabAdd = dview.findViewById(R.id.fabAdd);
final ContentLoadingProgressBar pbWait = dview.findViewById(R.id.pbWait);
rvKeyword.setHasFixedSize(false);
final LinearLayoutManager llm = new LinearLayoutManager(context);
final LinearLayoutManager llm = new LinearLayoutManager(getContext());
rvKeyword.setLayoutManager(llm);
final AdapterKeyword adapter = new AdapterKeyword(context, getViewLifecycleOwner());
final AdapterKeyword adapter = new AdapterKeyword(getContext(), getViewLifecycleOwner());
rvKeyword.setAdapter(adapter);
Helper.linkPro(tvPro);
fabAdd.setEnabled(ActivityBilling.isPro(context));
fabAdd.setEnabled(ActivityBilling.isPro(getContext()));
fabAdd.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -6360,16 +6356,16 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
pbWait.setVisibility(View.VISIBLE);
DB db = DB.getInstance(context);
DB db = DB.getInstance(getContext());
db.message().liveMessageKeywords(id).observe(getViewLifecycleOwner(), new Observer<TupleKeyword.Persisted>() {
@Override
public void onChanged(TupleKeyword.Persisted data) {
pbWait.setVisibility(View.GONE);
adapter.set(id, TupleKeyword.from(context, data));
adapter.set(id, TupleKeyword.from(getContext(), data));
}
});
return new AlertDialog.Builder(context)
return new AlertDialog.Builder(getContext())
.setTitle(R.string.title_manage_keywords)
.setView(dview)
.setPositiveButton(android.R.string.ok, null)
@@ -6383,13 +6379,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
final long id = getArguments().getLong("id");
final Context context = getContext();
View view = LayoutInflater.from(context).inflate(R.layout.dialog_keyword_add, null);
View view = LayoutInflater.from(getContext()).inflate(R.layout.dialog_keyword_add, null);
final EditText etKeyword = view.findViewById(R.id.etKeyword);
etKeyword.setText(null);
return new AlertDialog.Builder(context)
return new AlertDialog.Builder(getContext())
.setView(view)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
@@ -6430,7 +6424,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(context, getActivity(), args, "keyword:add");
}.execute(getContext(), getActivity(), args, "keyword:add");
}
}
})
@@ -6459,9 +6453,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (l.contains(folders[i]))
checked[i] = true;
final Context context = getContext();
return new AlertDialog.Builder(context)
return new AlertDialog.Builder(getContext())
.setTitle(R.string.title_manage_labels)
.setMultiChoiceItems(folders, checked, new DialogInterface.OnMultiChoiceClickListener() {
@Override