msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Scoped saved instance values

Browse Source
pull/152/head
M66B 7 years ago
parent 90444cd65e
commit 86ca2c00fc
8 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File

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

@ -251,7 +251,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
} }
if (savedInstanceState != null) if (savedInstanceState != null)
drawerToggle.setDrawerIndicatorEnabled(savedInstanceState.getBoolean("toggle")); drawerToggle.setDrawerIndicatorEnabled(savedInstanceState.getBoolean("fair:toggle"));
DB.getInstance(this).account().liveSynchronizingAccounts().observe(this, new Observer<List<EntityAccount>>() { DB.getInstance(this).account().liveSynchronizingAccounts().observe(this, new Observer<List<EntityAccount>>() {
@Override @Override
@ -264,7 +264,7 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
@Override @Override
protected void onSaveInstanceState(Bundle outState) { protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putBoolean("toggle", drawerToggle.isDrawerIndicatorEnabled()); outState.putBoolean("fair:toggle", drawerToggle.isDrawerIndicatorEnabled());
} }
@Override @Override

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

@ -372,7 +372,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
init(); init();
if (savedInstanceState != null) if (savedInstanceState != null)
drawerToggle.setDrawerIndicatorEnabled(savedInstanceState.getBoolean("toggle")); drawerToggle.setDrawerIndicatorEnabled(savedInstanceState.getBoolean("fair:toggle"));
new Handler().post(checkIntent); new Handler().post(checkIntent);
@ -481,7 +481,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
@Override @Override
protected void onSaveInstanceState(Bundle outState) { protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putBoolean("toggle", drawerToggle.isDrawerIndicatorEnabled()); outState.putBoolean("fair:toggle", drawerToggle.isDrawerIndicatorEnabled());
} }
@Override @Override

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

@ -1081,11 +1081,11 @@ public class FragmentAccount extends FragmentBase {
@Override @Override
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putInt("provider", spProvider.getSelectedItemPosition()); outState.putInt("fair:provider", spProvider.getSelectedItemPosition());
outState.putInt("auth_type", auth_type); outState.putInt("fair:auth_type", auth_type);
outState.putString("password", tilPassword.getEditText().getText().toString()); outState.putString("fair:password", tilPassword.getEditText().getText().toString());
outState.putInt("advanced", grpAdvanced.getVisibility()); outState.putInt("fair:advanced", grpAdvanced.getVisibility());
outState.putInt("color", color); outState.putInt("fair:color", color);
} }
@Override @Override
@ -1174,14 +1174,14 @@ public class FragmentAccount extends FragmentBase {
} }
}.execute(FragmentAccount.this, new Bundle(), "account:primary"); }.execute(FragmentAccount.this, new Bundle(), "account:primary");
} else { } else {
int provider = savedInstanceState.getInt("provider"); int provider = savedInstanceState.getInt("fair:provider");
spProvider.setTag(provider); spProvider.setTag(provider);
spProvider.setSelection(provider); spProvider.setSelection(provider);
auth_type = savedInstanceState.getInt("auth_type"); auth_type = savedInstanceState.getInt("fair:auth_type");
tilPassword.getEditText().setText(savedInstanceState.getString("password")); tilPassword.getEditText().setText(savedInstanceState.getString("fair:password"));
grpAdvanced.setVisibility(savedInstanceState.getInt("advanced")); grpAdvanced.setVisibility(savedInstanceState.getInt("fair:advanced"));
color = savedInstanceState.getInt("color"); color = savedInstanceState.getInt("fair:color");
} }
Helper.setViewsEnabled(view, true); Helper.setViewsEnabled(view, true);

4
app/src/main/java/eu/faircode/email/FragmentBase.java
Unescape View File

@ -56,7 +56,7 @@ public class FragmentBase extends Fragment {
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
Log.i("Save instance " + this); Log.i("Save instance " + this);
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putString("subtitle", subtitle); outState.putString("fair:subtitle", subtitle);
} }
@Override @Override
@ -64,7 +64,7 @@ public class FragmentBase extends Fragment {
Log.i("Create " + this + " saved=" + (savedInstanceState != null)); Log.i("Create " + this + " saved=" + (savedInstanceState != null));
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (savedInstanceState != null) if (savedInstanceState != null)
subtitle = savedInstanceState.getString("subtitle"); subtitle = savedInstanceState.getString("fair:subtitle");
} }
@Override @Override

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

@ -594,8 +594,8 @@ public class FragmentCompose extends FragmentBase {
@Override @Override
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putLong("working", working); outState.putLong("fair:working", working);
outState.putBoolean("show_images", show_images); outState.putBoolean("fair:show_images", show_images);
} }
@Override @Override
@ -628,8 +628,8 @@ public class FragmentCompose extends FragmentBase {
draftLoader.execute(this, args, "compose:edit"); draftLoader.execute(this, args, "compose:edit");
} }
} else { } else {
working = savedInstanceState.getLong("working"); working = savedInstanceState.getLong("fair:working");
show_images = savedInstanceState.getBoolean("show_images"); show_images = savedInstanceState.getBoolean("fair:show_images");
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString("action", working < 0 ? "new" : "edit"); args.putString("action", working < 0 ? "new" : "edit");

4
app/src/main/java/eu/faircode/email/FragmentFolders.java
Unescape View File

@ -192,7 +192,7 @@ public class FragmentFolders extends FragmentBase {
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
if (show_hidden != null) if (show_hidden != null)
outState.putBoolean("show_hidden", show_hidden); outState.putBoolean("fair:show_hidden", show_hidden);
} }
@Override @Override
@ -200,7 +200,7 @@ public class FragmentFolders extends FragmentBase {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
if (savedInstanceState != null) { if (savedInstanceState != null) {
show_hidden = (Boolean) savedInstanceState.get("show_hidden"); show_hidden = (Boolean) savedInstanceState.get("fair:show_hidden");
getActivity().invalidateOptionsMenu(); getActivity().invalidateOptionsMenu();
} }

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

@ -715,12 +715,12 @@ public class FragmentIdentity extends FragmentBase {
@Override @Override
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putInt("account", spAccount.getSelectedItemPosition()); outState.putInt("fair:account", spAccount.getSelectedItemPosition());
outState.putInt("provider", spProvider.getSelectedItemPosition()); outState.putInt("fair:provider", spProvider.getSelectedItemPosition());
outState.putInt("auth_type", auth_type); outState.putInt("fair:auth_type", auth_type);
outState.putString("password", tilPassword.getEditText().getText().toString()); outState.putString("fair:password", tilPassword.getEditText().getText().toString());
outState.putInt("advanced", grpAdvanced.getVisibility()); outState.putInt("fair:advanced", grpAdvanced.getVisibility());
outState.putInt("color", color); outState.putInt("fair:color", color);
} }
@Override @Override
@ -791,10 +791,10 @@ public class FragmentIdentity extends FragmentBase {
} }
}.execute(FragmentIdentity.this, new Bundle(), "identity:count"); }.execute(FragmentIdentity.this, new Bundle(), "identity:count");
} else { } else {
auth_type = savedInstanceState.getInt("auth_type"); auth_type = savedInstanceState.getInt("fair:auth_type");
tilPassword.getEditText().setText(savedInstanceState.getString("password")); tilPassword.getEditText().setText(savedInstanceState.getString("fair:password"));
grpAdvanced.setVisibility(savedInstanceState.getInt("advanced")); grpAdvanced.setVisibility(savedInstanceState.getInt("fair:advanced"));
color = savedInstanceState.getInt("color"); color = savedInstanceState.getInt("fair:color");
} }
Helper.setViewsEnabled(view, true); Helper.setViewsEnabled(view, true);
@ -865,11 +865,11 @@ public class FragmentIdentity extends FragmentBase {
} }
} }
} else { } else {
int provider = savedInstanceState.getInt("provider"); int provider = savedInstanceState.getInt("fair:provider");
spProvider.setTag(provider); spProvider.setTag(provider);
spProvider.setSelection(provider); spProvider.setSelection(provider);
int account = savedInstanceState.getInt("account"); int account = savedInstanceState.getInt("fair:account");
spAccount.setTag(account); spAccount.setTag(account);
spAccount.setSelection(account); spAccount.setSelection(account);
} }

20
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -1431,16 +1431,16 @@ public class FragmentMessages extends FragmentBase {
@Override @Override
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putBoolean("autoExpanded", autoExpanded); outState.putBoolean("fair:autoExpanded", autoExpanded);
outState.putInt("autoCloseCount", autoCloseCount); outState.putInt("fair:autoCloseCount", autoCloseCount);
outState.putStringArray("values", values.keySet().toArray(new String[0])); outState.putStringArray("fair:values", values.keySet().toArray(new String[0]));
for (String name : values.keySet()) for (String name : values.keySet())
outState.putLongArray(name, Helper.toLongArray(values.get(name))); outState.putLongArray("fair:name:" + name, Helper.toLongArray(values.get(name)));
if (rvMessage != null) { if (rvMessage != null) {
Parcelable rv = rvMessage.getLayoutManager().onSaveInstanceState(); Parcelable rv = rvMessage.getLayoutManager().onSaveInstanceState();
outState.putParcelable("rv", rv); outState.putParcelable("fair:rv", rv);
} }
if (selectionTracker != null) if (selectionTracker != null)
@ -1452,18 +1452,18 @@ public class FragmentMessages extends FragmentBase {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
if (savedInstanceState != null) { if (savedInstanceState != null) {
autoExpanded = savedInstanceState.getBoolean("autoExpanded"); autoExpanded = savedInstanceState.getBoolean("fair:autoExpanded");
autoCloseCount = savedInstanceState.getInt("autoCloseCount"); autoCloseCount = savedInstanceState.getInt("fair:autoCloseCount");
String[] names = savedInstanceState.getStringArray("values"); String[] names = savedInstanceState.getStringArray("fair:values");
for (String name : names) { for (String name : names) {
values.put(name, new ArrayList<Long>()); values.put(name, new ArrayList<Long>());
for (Long value : savedInstanceState.getLongArray(name)) for (Long value : savedInstanceState.getLongArray("fair:name:" + name))
values.get(name).add(value); values.get(name).add(value);
} }
if (rvMessage != null) { if (rvMessage != null) {
Parcelable rv = savedInstanceState.getBundle("rv"); Parcelable rv = savedInstanceState.getBundle("fair:rv");
rvMessage.getLayoutManager().onRestoreInstanceState(rv); rvMessage.getLayoutManager().onRestoreInstanceState(rv);
} }

Write Preview
Loading…
Cancel
Save