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

Save parent/child folders

This commit is contained in:
M66B 2019-03-18 11:15:23 +00:00
parent aad2f18505
commit 8098343fa1
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,6 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Color;
import android.os.Bundle;
import android.util.LongSparseArray;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@ -37,7 +36,9 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -67,7 +68,7 @@ public class FragmentFolders extends FragmentBase {
private boolean searching = false;
private AdapterFolder adapter;
private static LongSparseArray<List<TupleFolderEx>> parentChilds = new LongSparseArray<>();
private Map<Long, List<TupleFolderEx>> parentChilds = new HashMap<>();
@Override
public void onCreate(Bundle savedInstanceState) {
@ -78,11 +79,34 @@ public class FragmentFolders extends FragmentBase {
account = args.getLong("account", -1);
}
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putLongArray("fair:parents", Helper.toLongArray(parentChilds.keySet()));
for (Long parent : parentChilds.keySet()) {
List<TupleFolderEx> childs = parentChilds.get(parent);
outState.putInt("fair:childs:" + parent + ":count", childs.size());
for (int i = 0; i < childs.size(); i++)
outState.putSerializable("fair:childs:" + parent + ":" + i, childs.get(i));
}
}
@Override
@Nullable
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
setHasOptionsMenu(true);
if (savedInstanceState != null) {
for (long parent : savedInstanceState.getLongArray("fair:parents")) {
int count = savedInstanceState.getInt("fair:childs:" + parent + ":count");
List<TupleFolderEx> childs = new ArrayList<>(count);
for (int i = 0; i < count; i++)
childs.add((TupleFolderEx) savedInstanceState.getSerializable("fair:childs:" + parent + ":" + i));
parentChilds.put(parent, childs);
}
}
view = (ViewGroup) inflater.inflate(R.layout.fragment_folders, container, false);
// Get controls

3
app/src/main/java/eu/faircode/email/TupleFolderEx.java
View File

@ -19,9 +19,10 @@ package eu.faircode.email;
Copyright 2018-2019 by Marcel Bokhorst (M66B)
*/
import java.io.Serializable;
import java.util.Objects;
public class TupleFolderEx extends EntityFolder {
public class TupleFolderEx extends EntityFolder implements Serializable {
public String accountName;
public Integer accountColor;
public String accountState;