Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-28 00:20:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved folder collapsing/expanding

Browse Source
This commit is contained in:
M66B
2019-03-18 08:33:40 +00:00
parent afa752328c
commit 3a85a016f8
14 changed files with 1808 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/eu/faircode/email/EntityFolder.java
View File

@@ -69,7 +69,7 @@ public class EntityFolder implements Serializable {
@NonNull
public String type;
@NonNull
public Integer level;
public Integer level = 0; // obsolete
@NonNull
public Boolean synchronize;
@NonNull
@@ -84,6 +84,8 @@ public class EntityFolder implements Serializable {
@NonNull
public Boolean hide = false;
@NonNull
public Boolean collapsed = false;
@NonNull
public Boolean unified = false;
@NonNull
public Boolean notify = false;
@@ -200,6 +202,13 @@ public class EntityFolder implements Serializable {
return (display == null ? Helper.localizeFolderName(context, name) : display);
}
String getDisplayName(Context context, EntityFolder parent) {
String n = name;
if (parent != null && name.startsWith(parent.name))
n = n.substring(parent.name.length() + 1);
return (display == null ? Helper.localizeFolderName(context, n) : display);
}
boolean isOutgoing() {
return isOutgoing(this.type);
}
@@ -227,19 +236,6 @@ public class EntityFolder implements Serializable {
return USER;
}
static int getLevel(Character separator, String name) {
int level = 0;
if (separator != null) {
for (int i = 0; i < name.length(); i++)
if (name.charAt(i) == separator)
level++;
if (name.startsWith("INBOX" + separator))
level--;
}
return level;
}
String getParentName(Character separator) {
if (separator == null)
return null;
@@ -250,7 +246,6 @@ public class EntityFolder implements Serializable {
else
return name.substring(0, p);
}
}
@Override
@@ -261,7 +256,6 @@ public class EntityFolder implements Serializable {
Objects.equals(this.account, other.account) &&
this.name.equals(other.name) &&
this.type.equals(other.type) &&
this.level.equals(other.level) &&
this.synchronize.equals(other.synchronize) &&
this.poll.equals(other.poll) &&
this.download.equals(other.download) &&
@@ -269,6 +263,7 @@ public class EntityFolder implements Serializable {
this.keep_days.equals(other.keep_days) &&
Objects.equals(this.display, other.display) &&
this.hide == other.hide &&
this.collapsed == other.collapsed &&
this.unified == other.unified &&
this.notify == other.notify &&
Objects.equals(this.total, other.total) &&
@@ -292,7 +287,6 @@ public class EntityFolder implements Serializable {
json.put("id", id);
json.put("name", name);
json.put("type", type);
json.put("level", level);
json.put("synchronize", synchronize);
json.put("poll", poll);
json.put("download", download);
@@ -300,6 +294,7 @@ public class EntityFolder implements Serializable {
json.put("keep_days", keep_days);
json.put("display", display);
json.put("hide", hide);
json.put("collapsed", collapsed);
json.put("unified", unified);
json.put("notify", notify);
return json;
@@ -313,11 +308,6 @@ public class EntityFolder implements Serializable {
folder.name = json.getString("name");
folder.type = json.getString("type");
if (json.has("level"))
folder.level = json.getInt("level");
else
folder.level = 0;
folder.synchronize = json.getBoolean("synchronize");
if (json.has("poll"))
@@ -341,6 +331,8 @@ public class EntityFolder implements Serializable {
if (json.has("hide"))
folder.hide = json.getBoolean("hide");
if (json.has("collapsed"))
folder.collapsed = json.getBoolean("collapsed");
folder.unified = json.getBoolean("unified");