Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-10 11:03:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added folder display name

Browse Source
This commit is contained in:
M66B
2018-09-19 17:47:03 +00:00
parent c481754dee
commit 07f6d33efd
14 changed files with 1065 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,9 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
ivState.setImageResource(R.drawable.baseline_cloud_off_24);
ivState.setVisibility(folder.synchronize || folder.state != null ? View.VISIBLE : View.INVISIBLE);
String name = Helper.localizeFolderName(context, folder.name);
String name = (folder.display == null
? Helper.localizeFolderName(context, folder.name)
: folder.display);
if (folder.unseen > 0)
tvName.setText(context.getString(R.string.title_folder_unseen, name, folder.unseen));
else

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

@@ -216,8 +216,12 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
tvFolder.setText(message.accountName);
else if (viewType == ViewType.FOLDER)
tvFolder.setVisibility(View.GONE);
else
tvFolder.setText(Helper.localizeFolderName(context, message.folderName));
else {
String name = (message.folderDisplay == null
? Helper.localizeFolderName(context, message.folderName)
: message.folderDisplay);
tvFolder.setText(name);
}
if (viewType == ViewType.THREAD) {
tvCount.setVisibility(View.GONE);

9
app/src/main/java/eu/faircode/email/DB.java
View File

@@ -45,7 +45,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase;
// https://developer.android.com/topic/libraries/architecture/room.html
@Database(
version = 17,
version = 18,
entities = {
EntityIdentity.class,
EntityAccount.class,
@@ -236,6 +236,13 @@ public abstract class DB extends RoomDatabase {
db.execSQL("ALTER TABLE `message` ADD COLUMN `deliveredto` TEXT");
}
})
.addMigrations(new Migration(17, 18) {
@Override
public void migrate(SupportSQLiteDatabase db) {
Log.i(Helper.TAG, "DB migration from version " + startVersion + " to " + endVersion);
db.execSQL("ALTER TABLE `folder` ADD COLUMN `display` TEXT");
}
})
.build();
}

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

@@ -121,8 +121,8 @@ public interface DaoFolder {
" AND type = :type")
int setFolderUser(long account, String type);
@Query("UPDATE folder SET name = :name, synchronize = :synchronize, unified = :unified, after = :after WHERE id = :id")
int setFolderProperties(long id, String name, boolean synchronize, boolean unified, int after);
@Query("UPDATE folder SET name = :name, display = :display, synchronize = :synchronize, unified = :unified, after = :after WHERE id = :id")
int setFolderProperties(long id, String name, String display, boolean synchronize, boolean unified, int after);
@Query("UPDATE folder SET name = :name WHERE account = :account AND name = :old")
int renameFolder(long account, String old, String name);

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

@@ -37,7 +37,7 @@ public interface DaoMessage {
@Query("SELECT message.*" +
", account.name AS accountName, account.color AS accountColor" +
", folder.name as folderName, folder.type as folderType" +
", folder.name as folderName, folder.display as folderDisplay, folder.type as folderType" +
", SUM(CASE WHEN folder.type = '" + EntityFolder.ARCHIVE + "' THEN 0 ELSE 1 END) > 1 AS threaded" +
", COUNT(message.id) AS count" +
", SUM(CASE WHEN message.ui_seen" +
@@ -66,7 +66,7 @@ public interface DaoMessage {
@Query("SELECT message.*" +
", account.name AS accountName, account.color AS accountColor" +
", folder.name as folderName, folder.type as folderType" +
", folder.name as folderName, folder.display as folderDisplay, folder.type as folderType" +
", SUM(CASE WHEN folder.type = '" + EntityFolder.ARCHIVE + "' THEN 0 ELSE 1 END) > 1 AS threaded" +
", COUNT(message.id) AS count" +
", SUM(CASE WHEN message.ui_seen" +
@@ -97,7 +97,7 @@ public interface DaoMessage {
@Query("SELECT message.*" +
", account.name AS accountName, account.color AS accountColor" +
", folder.name as folderName, folder.type as folderType" +
", folder.name as folderName, folder.display as folderDisplay, folder.type as folderType" +
", 0 AS threaded" +
", 1 AS count" +
", CASE WHEN message.ui_seen THEN 0 ELSE 1 END as unseen" +
@@ -159,7 +159,7 @@ public interface DaoMessage {
@Query("SELECT message.*" +
", account.name AS accountName, account.color AS accountColor" +
", folder.name as folderName, folder.type as folderType" +
", folder.name as folderName, folder.display as folderDisplay, folder.type as folderType" +
", 0 AS threaded" +
", (SELECT COUNT(m1.id) FROM message m1 WHERE m1.account = message.account AND m1.thread = message.thread AND NOT m1.ui_hide) AS count" +
", (SELECT COUNT(m2.id) FROM message m2 WHERE m2.account = message.account AND m2.thread = message.thread AND NOT m2.ui_hide AND NOT m2.ui_seen) AS unseen" +

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

@@ -58,6 +58,7 @@ public class EntityFolder implements Parcelable {
public Long account; // Outbox = null
@NonNull
public String name;
public String display;
@NonNull
public String type;
@NonNull

12
app/src/main/java/eu/faircode/email/FragmentFolder.java
View File

@@ -50,6 +50,7 @@ import androidx.lifecycle.Observer;
public class FragmentFolder extends FragmentEx {
private ViewGroup view;
private EditText etRename;
private EditText etDisplay;
private CheckBox cbSynchronize;
private CheckBox cbUnified;
private EditText etAfter;
@@ -82,6 +83,7 @@ public class FragmentFolder extends FragmentEx {
// Get controls
etRename = view.findViewById(R.id.etRename);
etDisplay = view.findViewById(R.id.etDisplay);
cbSynchronize = view.findViewById(R.id.cbSynchronize);
cbUnified = view.findViewById(R.id.cbUnified);
etAfter = view.findViewById(R.id.etAfter);
@@ -102,6 +104,7 @@ public class FragmentFolder extends FragmentEx {
args.putLong("id", id);
args.putLong("account", account);
args.putString("name", etRename.getText().toString());
args.putString("display", etDisplay.getText().toString());
args.putBoolean("synchronize", cbSynchronize.isChecked());
args.putBoolean("unified", cbUnified.isChecked());
args.putString("after", etAfter.getText().toString());
@@ -112,9 +115,13 @@ public class FragmentFolder extends FragmentEx {
long id = args.getLong("id");
long aid = args.getLong("account");
String name = args.getString("name");
String display = args.getString("display");
boolean synchronize = args.getBoolean("synchronize");
boolean unified = args.getBoolean("unified");
String after = args.getString("after");
if (TextUtils.isEmpty(display))
display = null;
int days = (TextUtils.isEmpty(after) ? EntityFolder.DEFAULT_USER_SYNC : Integer.parseInt(after));
IMAPStore istore = null;
@@ -143,6 +150,7 @@ public class FragmentFolder extends FragmentEx {
EntityFolder create = new EntityFolder();
create.account = aid;
create.name = name;
create.display = display;
create.type = EntityFolder.USER;
create.unified = unified;
create.synchronize = synchronize;
@@ -161,7 +169,7 @@ public class FragmentFolder extends FragmentEx {
if (folder != null) {
Log.i(Helper.TAG, "Updating folder=" + name);
db.folder().setFolderProperties(id, name, synchronize, unified, days);
db.folder().setFolderProperties(id, name, display, synchronize, unified, days);
if (!synchronize)
db.folder().setFolderError(id, null);
}
@@ -304,6 +312,8 @@ public class FragmentFolder extends FragmentEx {
if (savedInstanceState == null) {
etRename.setText(folder == null ? null : folder.name);
etDisplay.setText(folder == null ? null : folder.display);
etDisplay.setHint(folder == null ? null : folder.name);
cbUnified.setChecked(folder == null ? false : folder.unified);
etAfter.setText(Integer.toString(folder == null ? EntityFolder.DEFAULT_USER_SYNC : folder.after));
}

22
app/src/main/java/eu/faircode/email/FragmentMessage.java
View File

@@ -464,7 +464,10 @@ public class FragmentMessage extends FragmentEx {
super.onActivityCreated(savedInstanceState);
if (savedInstanceState == null) {
setSubtitle(Helper.localizeFolderName(getContext(), message.folderName));
String name = (message.folderDisplay == null
? Helper.localizeFolderName(getContext(), message.folderName)
: message.folderDisplay);
setSubtitle(name);
ivFlagged.setImageResource(message.ui_flagged ? R.drawable.baseline_star_24 : R.drawable.baseline_star_border_24);
tvFrom.setText(MessageHelper.getFormattedAddresses(message.from, true));
@@ -565,7 +568,10 @@ public class FragmentMessage extends FragmentEx {
getActivity().invalidateOptionsMenu();
// Messages can be moved to another folder
setSubtitle(Helper.localizeFolderName(getContext(), message.folderName));
String name = (message.folderDisplay == null
? Helper.localizeFolderName(getContext(), message.folderName)
: message.folderDisplay);
setSubtitle(name);
// Observe folders
if (observing)
@@ -832,8 +838,7 @@ public class FragmentMessage extends FragmentEx {
int order = 0;
for (EntityAnswer answer : answers)
popupMenu.getMenu().add(Menu.NONE, answer.id.intValue(), order++,
Helper.localizeFolderName(getContext(), answer.name));
popupMenu.getMenu().add(Menu.NONE, answer.id.intValue(), order++, answer.name);
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
@@ -1065,9 +1070,12 @@ public class FragmentMessage extends FragmentEx {
PopupMenu popupMenu = new PopupMenu(getContext(), anchor);
int order = 0;
for (EntityFolder folder : folders)
popupMenu.getMenu().add(Menu.NONE, folder.id.intValue(), order++,
Helper.localizeFolderName(getContext(), folder.name));
for (EntityFolder folder : folders) {
String name = (folder.display == null
? Helper.localizeFolderName(getContext(), folder.name)
: folder.display);
popupMenu.getMenu().add(Menu.NONE, folder.id.intValue(), order++, name);
}
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override

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

@@ -432,7 +432,9 @@ public class FragmentMessages extends FragmentEx {
if (folder == null)
setSubtitle(null);
else {
String name = Helper.localizeFolderName(getContext(), folder.name);
String name = (folder.display == null
? Helper.localizeFolderName(getContext(), folder.name)
: folder.display);
if (folder.unseen > 0)
setSubtitle(getString(R.string.title_folder_unseen, name, folder.unseen));
else

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

@@ -23,6 +23,7 @@ public class TupleMessageEx extends EntityMessage {
public String accountName;
public Integer accountColor;
public String folderName;
public String folderDisplay;
public String folderType;
public boolean threaded;
public int count;
@@ -38,6 +39,7 @@ public class TupleMessageEx extends EntityMessage {
(this.accountName == null ? other.accountName == null : this.accountName.equals(other.accountName)) &&
(this.accountColor == null ? other.accountColor == null : this.accountColor.equals(other.accountColor)) &&
this.folderName.equals(other.folderName) &&
(this.folderDisplay == null ? other.folderDisplay == null : this.folderDisplay.equals(other.folderDisplay)) &&
this.folderType.equals(other.folderType) &&
this.threaded == other.threaded &&
this.count == other.count &&