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

Prevent crash

This commit is contained in:
M66B 2022-04-21 10:11:04 +02:00
parent b4fc882627
commit a343af5d7a
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,7 +360,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
@Override
protected void onSaveInstanceState(Bundle outState) {
outState.putBoolean("fair:toggle", drawerToggle.isDrawerIndicatorEnabled());
outState.putBoolean("fair:toggle", drawerToggle == null || drawerToggle.isDrawerIndicatorEnabled());
outState.putString("fair:password", password);
outState.putBoolean("fair:import_accounts", import_accounts);
outState.putBoolean("fair:import_delete", import_delete);
@ -1721,8 +1721,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
@Override
public void onSaveInstanceState(@NonNull Bundle outState) {
outState.putString("fair:password1", etPassword1.getEditText().getText().toString());
outState.putString("fair:password2", etPassword2.getEditText().getText().toString());
outState.putString("fair:password1", etPassword1 == null ? null : etPassword1.getEditText().getText().toString());
outState.putString("fair:password2", etPassword2 == null ? null : etPassword2.getEditText().getText().toString());
super.onSaveInstanceState(outState);
}
@ -1776,7 +1776,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
@Override
public void onSaveInstanceState(@NonNull Bundle outState) {
outState.putString("fair:password1", etPassword1.getEditText().getText().toString());
outState.putString("fair:password1", etPassword1 == null ? null : etPassword1.getEditText().getText().toString());
super.onSaveInstanceState(outState);
}

2
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@ -740,7 +740,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
@Override
protected void onSaveInstanceState(Bundle outState) {
outState.putParcelable("fair:intent", getIntent());
outState.putBoolean("fair:toggle", drawerToggle.isDrawerIndicatorEnabled());
outState.putBoolean("fair:toggle", drawerToggle == null || drawerToggle.isDrawerIndicatorEnabled());
outState.putBoolean("fair:searching", searching);
super.onSaveInstanceState(outState);
}

6
app/src/main/java/eu/faircode/email/FragmentAccount.java
View File

@ -1409,10 +1409,10 @@ public class FragmentAccount extends FragmentBase {
@Override
public void onSaveInstanceState(Bundle outState) {
outState.putInt("fair:provider", spProvider.getSelectedItemPosition());
outState.putInt("fair:provider", spProvider == null ? 0 : spProvider.getSelectedItemPosition());
outState.putString("fair:certificate", certificate);
outState.putString("fair:password", tilPassword.getEditText().getText().toString());
outState.putInt("fair:advanced", grpAdvanced.getVisibility());
outState.putString("fair:password", tilPassword == null ? null : tilPassword.getEditText().getText().toString());
outState.putInt("fair:advanced", grpAuthorize == null ? View.VISIBLE : grpAdvanced.getVisibility());
outState.putInt("fair:auth", auth);
outState.putString("fair:authprovider", provider);
super.onSaveInstanceState(outState);

2
app/src/main/java/eu/faircode/email/FragmentDialogInsertLink.java
View File

@ -41,7 +41,7 @@ public class FragmentDialogInsertLink extends FragmentDialogBase {
@Override
public void onSaveInstanceState(@NonNull Bundle outState) {
outState.putString("fair:link", etLink.getText().toString());
outState.putString("fair:link", etLink == null ? null : etLink.getText().toString());
super.onSaveInstanceState(outState);
}

8
app/src/main/java/eu/faircode/email/FragmentIdentity.java
View File

@ -1091,11 +1091,11 @@ public class FragmentIdentity extends FragmentBase {
@Override
public void onSaveInstanceState(Bundle outState) {
outState.putInt("fair:account", spAccount.getSelectedItemPosition());
outState.putInt("fair:provider", spProvider.getSelectedItemPosition());
outState.putInt("fair:account", spAccount == null ? 0 : spAccount.getSelectedItemPosition());
outState.putInt("fair:provider", spProvider == null ? 0 : spProvider.getSelectedItemPosition());
outState.putString("fair:certificate", certificate);
outState.putString("fair:password", tilPassword.getEditText().getText().toString());
outState.putInt("fair:advanced", grpAdvanced.getVisibility());
outState.putString("fair:password", tilPassword == null ? null : tilPassword.getEditText().getText().toString());
outState.putInt("fair:advanced", grpAdvanced == null ? View.VISIBLE : grpAdvanced.getVisibility());
outState.putInt("fair:auth", auth);
outState.putString("fair:authprovider", provider);
outState.putString("fair:html", signature);

2
app/src/main/java/eu/faircode/email/FragmentPop.java
View File

@ -649,7 +649,7 @@ public class FragmentPop extends FragmentBase {
@Override
public void onSaveInstanceState(Bundle outState) {
outState.putString("fair:password", tilPassword.getEditText().getText().toString());
outState.putString("fair:password", tilPassword == null ? null : tilPassword.getEditText().getText().toString());
outState.putInt("fair:auth", auth);
super.onSaveInstanceState(outState);
}

2
app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
View File

@ -108,7 +108,7 @@ public class FragmentQuickSetup extends FragmentBase {
@Override
public void onSaveInstanceState(Bundle outState) {
outState.putString("fair:password", tilPassword.getEditText().getText().toString());
outState.putString("fair:password", tilPassword == null ? null : tilPassword.getEditText().getText().toString());
outState.putParcelable("fair:best", bestProvider);
outState.putParcelable("fair:args", bestArgs);
}

16
app/src/main/java/eu/faircode/email/FragmentRule.java
View File

@ -807,15 +807,15 @@ public class FragmentRule extends FragmentBase {
@Override
public void onSaveInstanceState(Bundle outState) {
Object tag = btnFolder.getTag();
outState.putInt("fair:start", spScheduleDayStart.getSelectedItemPosition());
outState.putInt("fair:end", spScheduleDayEnd.getSelectedItemPosition());
outState.putInt("fair:action", spAction.getSelectedItemPosition());
outState.putInt("fair:importance", spImportance.getSelectedItemPosition());
Object tag = (btnFolder == null ? null : btnFolder.getTag());
outState.putInt("fair:start", spScheduleDayStart == null ? 0 : spScheduleDayStart.getSelectedItemPosition());
outState.putInt("fair:end", spScheduleDayEnd == null ? 0 : spScheduleDayEnd.getSelectedItemPosition());
outState.putInt("fair:action", spAction == null ? 0 : spAction.getSelectedItemPosition());
outState.putInt("fair:importance", spImportance == null ? 0 : spImportance.getSelectedItemPosition());
outState.putLong("fair:target", tag == null ? -1 : (long) tag);
outState.putCharSequence("fair:name", btnFolder.getText());
outState.putInt("fair:identity", spIdent.getSelectedItemPosition());
outState.putInt("fair:answer", spAnswer.getSelectedItemPosition());
outState.putCharSequence("fair:name", btnFolder == null ? null : btnFolder.getText());
outState.putInt("fair:identity", spIdent == null ? 0 : spIdent.getSelectedItemPosition());
outState.putInt("fair:answer", spAnswer == null ? 0 : spAnswer.getSelectedItemPosition());
outState.putParcelable("fair:sound", sound);
super.onSaveInstanceState(outState);