mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added fail-safe

This commit is contained in:
M66B 2023-08-22 17:50:01 +02:00
parent ee8b976dc6
commit d0a97331eb
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/eu/faircode/email/FragmentDialogSelectAccount.java
View File

@ -52,16 +52,21 @@ public class FragmentDialogSelectAccount extends FragmentDialogBase {
@Override
public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
View view = super.getView(position, convertView, parent);
EntityAccount account = (EntityAccount) getItem(position);
View vwColor = view.findViewById(R.id.vwColor);
TextView tv = view.findViewById(android.R.id.text1);
try {
EntityAccount account = getItem(position);
int vpad = (getCount() > 10 ? dp6 : dp12);
tv.setPadding(0, vpad, 0, vpad);
View vwColor = view.findViewById(R.id.vwColor);
TextView tv = view.findViewById(android.R.id.text1);
vwColor.setBackgroundColor(account.color == null ? Color.TRANSPARENT : account.color);
tv.setText(account.name);
int vpad = (getCount() > 10 ? dp6 : dp12);
tv.setPadding(0, vpad, 0, vpad);
vwColor.setBackgroundColor(account.color == null ? Color.TRANSPARENT : account.color);
tv.setText(account.name);
} catch (Throwable ex) {
Log.e(ex);
}
return view;
}

21
app/src/main/java/eu/faircode/email/FragmentDialogSelectIdentity.java
View File

@ -51,17 +51,22 @@ public class FragmentDialogSelectIdentity extends FragmentDialogBase {
@Override
public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
View view = super.getView(position, convertView, parent);
TupleIdentityEx identity = getItem(position);
View vwColor = view.findViewById(R.id.vwColor);
TextView tv = view.findViewById(android.R.id.text1);
try {
TupleIdentityEx identity = getItem(position);
int vpad = (getCount() > 10 ? dp6 : dp12);
tv.setPadding(0, vpad, 0, vpad);
View vwColor = view.findViewById(R.id.vwColor);
TextView tv = view.findViewById(android.R.id.text1);
Integer color = (identity.color == null ? identity.accountColor : identity.color);
vwColor.setBackgroundColor(color == null ? Color.TRANSPARENT : color);
tv.setText(identity.getDisplayName());
int vpad = (getCount() > 10 ? dp6 : dp12);
tv.setPadding(0, vpad, 0, vpad);
Integer color = (identity.color == null ? identity.accountColor : identity.color);
vwColor.setBackgroundColor(color == null ? Color.TRANSPARENT : color);
tv.setText(identity.getDisplayName());
} catch (Throwable ex) {
Log.e(ex);
}
return view;
}