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

Delegate deletion of accounts, identities & folders

Browse Source
pull/146/head
M66B 6 years ago
parent fe43910b93
commit 0c072fb980
19 changed files with 1546 additions and 358 deletions

1196
app/schemas/eu.faircode.email.DB/18.json
View File

File diff suppressed because it is too large Load Diff

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

@ -67,7 +67,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
ViewHolder(View itemView) {
super(itemView);
this.itemView = itemView;
this.itemView = itemView.findViewById(R.id.clItem);
vwColor = itemView.findViewById(R.id.vwColor);
ivPrimary = itemView.findViewById(R.id.ivPrimary);
tvName = itemView.findViewById(R.id.tvName);
@ -88,6 +88,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
}
private void bindTo(EntityAccount account) {
itemView.setActivated(account.tbd != null);
vwColor.setBackgroundColor(account.color == null ? Color.TRANSPARENT : account.color);
ivPrimary.setVisibility(account.primary ? View.VISIBLE : View.INVISIBLE);
tvName.setText(account.name);

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

@ -82,7 +82,6 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
private final static int action_delete_local = 2;
private final static int action_empty_trash = 3;
private final static int action_edit_properties = 4;
private final static int action_legend = 5;
ViewHolder(View itemView) {
super(itemView);
@ -112,6 +111,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
}
private void bindTo(TupleFolderEx folder) {
itemView.setActivated(folder.tbd != null);
itemView.setAlpha(folder.hide ? 0.5f : 1.0f);
vwColor.setBackgroundColor(folder.accountColor == null ? Color.TRANSPARENT : folder.accountColor);

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

@ -63,7 +63,7 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
ViewHolder(View itemView) {
super(itemView);
this.itemView = itemView;
this.itemView = itemView.findViewById(R.id.clItem);
vwColor = itemView.findViewById(R.id.vwColor);
ivPrimary = itemView.findViewById(R.id.ivPrimary);
tvName = itemView.findViewById(R.id.tvName);
@ -84,6 +84,7 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
}
private void bindTo(TupleIdentityEx identity) {
itemView.setActivated(identity.tbd != null);
vwColor.setBackgroundColor(identity.color == null ? Color.TRANSPARENT : identity.color);
ivPrimary.setVisibility(identity.primary ? View.VISIBLE : View.INVISIBLE);
tvName.setText(identity.name);

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

@ -46,7 +46,7 @@ import io.requery.android.database.sqlite.RequerySQLiteOpenHelperFactory;
// https://developer.android.com/topic/libraries/architecture/room.html
@Database(
version = 17,
version = 18,
entities = {
EntityIdentity.class,
EntityAccount.class,
@ -259,6 +259,15 @@ public abstract class DB extends RoomDatabase {
db.execSQL("CREATE UNIQUE INDEX `index_message_msgid_folder` ON `message` (`msgid`, `folder`)");
}
})
.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 `account` ADD COLUMN `tbd` INTEGER");
db.execSQL("ALTER TABLE `identity` ADD COLUMN `tbd` INTEGER");
db.execSQL("ALTER TABLE `folder` ADD COLUMN `tbd` INTEGER");
}
})
.build();
}

7
app/src/main/java/eu/faircode/email/DaoAccount.java
Unescape View File

@ -90,7 +90,10 @@ public interface DaoAccount {
@Query("UPDATE account SET `primary` = 0")
void resetPrimary();
@Query("DELETE FROM account WHERE id = :id")
void deleteAccount(long id);
@Query("UPDATE account SET tbd = 1 WHERE id = :id")
int setAccountTbd(long id);
@Query("DELETE FROM account WHERE tbd = 1")
int deleteAccountsTbd();
}

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

@ -152,20 +152,17 @@ public interface DaoFolder {
@Query("UPDATE folder" +
" SET name = :name" +
", display = :display" +
", unified = :unified" +
", hide = :hide" +
", synchronize = :synchronize" +
", poll = :poll" +
", unified = :unified" +
", `sync_days` = :sync_days" +
", `keep_days` = :keep_days" +
" WHERE id = :id")
int setFolderProperties(
long id,
String name, String display,
boolean hide,
boolean synchronize,
boolean poll,
boolean unified,
String name, String display, boolean unified, boolean hide,
boolean synchronize, boolean poll,
int sync_days, int keep_days);
@Query("UPDATE folder SET keywords = :keywords WHERE id = :id")
@ -174,6 +171,9 @@ public interface DaoFolder {
@Query("UPDATE folder SET name = :name WHERE account = :account AND name = :old")
int renameFolder(long account, String old, String name);
@Query("UPDATE folder SET tbd = 1 WHERE id = :id")
int setFolderTbd(long id);
@Query("DELETE FROM folder WHERE id = :id")
void deleteFolder(long id);

7
app/src/main/java/eu/faircode/email/DaoIdentity.java
Unescape View File

@ -73,6 +73,9 @@ public interface DaoIdentity {
@Query("UPDATE identity SET `primary` = 0")
void resetPrimary();
@Query("DELETE FROM identity WHERE id = :id")
void deleteIdentity(long id);
@Query("UPDATE identity SET tbd = 1 WHERE id = :id")
int setIdentityTbd(long id);
@Query("DELETE FROM identity WHERE tbd = 1")
int deleteIdentitiesTbd();
}

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

@ -62,6 +62,7 @@ public class EntityAccount {
@NonNull
public Integer poll_interval; // keep-alive interval
public Long created;
public Boolean tbd;
public String state;
public String error;
public Long last_connected;
@ -128,6 +129,7 @@ public class EntityAccount {
this.notify.equals(other.notify) &&
this.poll_interval.equals(other.poll_interval) &&
(this.created == null ? other.created == null : this.created.equals(other.created)) &&
(this.tbd == null ? other.tbd == null : this.tbd.equals(other.tbd)) &&
(this.state == null ? other.state == null : this.state.equals(other.state)) &&
(this.error == null ? other.error == null : this.error.equals(other.error)));
} else

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

@ -80,6 +80,7 @@ public class EntityFolder implements Serializable {
@NonNull
public Boolean unified = false;
public String[] keywords;
public Boolean tbd;
public String state;
public String sync_state;
public String error;
@ -176,6 +177,8 @@ public class EntityFolder implements Serializable {
(this.display == null ? other.display == null : this.display.equals(other.display)) &&
this.hide == other.hide &&
this.unified == other.unified &&
Helper.equal(this.keywords, other.keywords) &&
(this.tbd == null ? other.tbd == null : this.tbd.equals(other.tbd)) &&
(this.state == null ? other.state == null : this.state.equals(other.state)) &&
(this.sync_state == null ? other.sync_state == null : this.sync_state.equals(other.sync_state)) &&
(this.error == null ? other.error == null : this.error.equals(other.error)));

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

@ -75,6 +75,7 @@ public class EntityIdentity {
@NonNull
public Boolean store_sent;
public Long sent_folder;
public Boolean tbd;
public String state;
public String error;
@ -149,6 +150,7 @@ public class EntityIdentity {
this.synchronize.equals(other.synchronize) &&
this.store_sent.equals(other.store_sent) &&
(this.sent_folder == null ? other.sent_folder == null : this.sent_folder.equals(other.sent_folder)) &&
(this.tbd == null ? other.tbd == null : this.tbd.equals(other.tbd)) &&
(this.state == null ? other.state == null : this.state.equals(other.state)) &&
(this.error == null ? other.error == null : this.error.equals(other.error)));
} else

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

@ -1052,11 +1052,12 @@ public class FragmentAccount extends FragmentEx {
@Override
protected Void onLoad(Context context, Bundle args) {
long id = args.getLong("id");
DB db = DB.getInstance(context);
EntityAccount account = db.account().getAccount(id);
db.account().deleteAccount(id);
if (account.synchronize)
db.account().setAccountTbd(id);
ServiceSynchronize.reload(getContext(), "delete account");
return null;
}

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

@ -37,21 +37,15 @@ import android.widget.EditText;
import android.widget.ProgressBar;
import com.google.android.material.snackbar.Snackbar;
import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPStore;
import java.util.Calendar;
import java.util.Properties;
import javax.mail.Folder;
import javax.mail.Session;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
public class FragmentFolder extends FragmentEx {
private ViewGroup view;
private EditText etRename;
private EditText etName;
private EditText etDisplay;
private CheckBox cbHide;
private CheckBox cbSynchronize;
@ -85,7 +79,7 @@ public class FragmentFolder extends FragmentEx {
view = (ViewGroup) inflater.inflate(R.layout.fragment_folder, container, false);
// Get controls
etRename = view.findViewById(R.id.etRename);
etName = view.findViewById(R.id.etName);
etDisplay = view.findViewById(R.id.etDisplay);
cbHide = view.findViewById(R.id.cbHide);
cbSynchronize = view.findViewById(R.id.cbSynchronize);
@ -114,7 +108,7 @@ public class FragmentFolder extends FragmentEx {
Bundle args = new Bundle();
args.putLong("id", id);
args.putLong("account", account);
args.putString("name", etRename.getText().toString());
args.putString("name", etName.getText().toString());
args.putString("display", etDisplay.getText().toString());
args.putBoolean("hide", cbHide.isChecked());
args.putBoolean("unified", cbUnified.isChecked());
@ -125,7 +119,7 @@ public class FragmentFolder extends FragmentEx {
new SimpleTask<Void>() {
@Override
protected Void onLoad(Context context, Bundle args) throws Throwable {
protected Void onLoad(Context context, Bundle args) {
long id = args.getLong("id");
long aid = args.getLong("account");
String name = args.getString("name");
@ -144,37 +138,21 @@ public class FragmentFolder extends FragmentEx {
if (keep_days < sync_days)
keep_days = sync_days;
boolean reload = false;
EntityFolder folder;
IMAPStore istore = null;
boolean reload;
DB db = DB.getInstance(getContext());
try {
db.beginTransaction();
folder = db.folder().getFolder(id);
if (folder == null || !folder.name.equals(name)) {
EntityAccount account = db.account().getAccount(folder == null ? aid : folder.account);
Properties props = MessageHelper.getSessionProperties(account.auth_type, account.insecure);
Session isession = Session.getInstance(props, null);
istore = (IMAPStore) isession.getStore(account.starttls ? "imap" : "imaps");
Helper.connect(context, istore, account);
char separator = istore.getDefaultFolder().getSeparator();
EntityFolder folder = db.folder().getFolder(id);
if (folder == null) {
reload = true;
Log.i(Helper.TAG, "Creating folder=" + name);
IMAPFolder ifolder = (IMAPFolder) istore.getFolder(name);
if (ifolder.exists())
throw new IllegalArgumentException(getString(R.string.title_folder_exists, name));
ifolder.create(Folder.HOLDS_MESSAGES);
EntityFolder create = new EntityFolder();
create.account = aid;
create.name = name;
create.level = EntityFolder.getLevel(separator, name);
create.level = 0;
create.display = display;
create.hide = hide;
create.type = EntityFolder.USER;
@ -185,20 +163,7 @@ public class FragmentFolder extends FragmentEx {
create.keep_days = keep_days;
db.folder().insertFolder(create);
} else {
Log.i(Helper.TAG, "Renaming folder=" + name);
IMAPFolder iold = (IMAPFolder) istore.getFolder(folder.name);
IMAPFolder ifolder = (IMAPFolder) istore.getFolder(name);
if (ifolder.exists())
throw new IllegalArgumentException(getString(R.string.title_folder_exists, name));
iold.renameTo(ifolder);
}
}
if (folder != null) {
reload = (!folder.name.equals(name) ||
!folder.synchronize.equals(synchronize) ||
!folder.poll.equals(poll));
reload = (!folder.synchronize.equals(synchronize) || !folder.poll.equals(poll));
Calendar cal_keep = Calendar.getInstance();
cal_keep.add(Calendar.DAY_OF_MONTH, -keep_days);
@ -213,30 +178,25 @@ public class FragmentFolder extends FragmentEx {
Log.i(Helper.TAG, "Updating folder=" + name);
db.folder().setFolderProperties(id,
name, display,
hide,
name, display, unified, hide,
synchronize, poll,
unified,
sync_days, keep_days);
db.message().deleteMessagesBefore(id, keep_time, true);
if (!synchronize)
db.folder().setFolderError(id, null);
EntityOperation.sync(db, folder.id);
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();
if (istore != null)
istore.close();
}
if (folder == null || !folder.name.equals(name) || reload)
if (reload)
ServiceSynchronize.reload(getContext(), "save folder");
else
EntityOperation.sync(db, folder.id);
return null;
}
@ -308,34 +268,11 @@ public class FragmentFolder extends FragmentEx {
new SimpleTask<Void>() {
@Override
protected Void onLoad(Context context, Bundle args) throws Throwable {
protected Void onLoad(Context context, Bundle args) {
long id = args.getLong("id");
IMAPStore istore = null;
DB db = DB.getInstance(getContext());
try {
db.beginTransaction();
EntityFolder folder = db.folder().getFolder(id);
EntityAccount account = db.account().getAccount(folder.account);
Properties props = MessageHelper.getSessionProperties(account.auth_type, account.insecure);
Session isession = Session.getInstance(props, null);
istore = (IMAPStore) isession.getStore(account.starttls ? "imap" : "imaps");
Helper.connect(context, istore, account);
IMAPFolder ifolder = (IMAPFolder) istore.getFolder(folder.name);
ifolder.delete(false);
db.folder().deleteFolder(id);
db.setTransactionSuccessful();
} finally {
db.endTransaction();
if (istore != null)
istore.close();
}
db.folder().setFolderTbd(id);
ServiceSynchronize.reload(getContext(), "delete folder");
@ -374,7 +311,7 @@ public class FragmentFolder extends FragmentEx {
new SimpleTask<EntityFolder>() {
@Override
protected EntityFolder onLoad(Context context, Bundle args) throws Throwable {
protected EntityFolder onLoad(Context context, Bundle args) {
long id = args.getLong("id");
return DB.getInstance(context).folder().getFolder(id);
}
@ -382,7 +319,7 @@ public class FragmentFolder extends FragmentEx {
@Override
protected void onLoaded(Bundle args, EntityFolder folder) {
if (savedInstanceState == null) {
etRename.setText(folder == null ? null : folder.name);
etName.setText(folder == null ? null : folder.name);
etDisplay.setText(folder == null ? null : (folder.display == null ? folder.name : folder.display));
etDisplay.setHint(folder == null ? null : folder.name);
cbHide.setChecked(folder == null ? false : folder.hide);
@ -396,7 +333,7 @@ public class FragmentFolder extends FragmentEx {
// Consider previous save as cancelled
pbWait.setVisibility(View.GONE);
Helper.setViewsEnabled(view, true);
etRename.setEnabled(folder == null || EntityFolder.USER.equals(folder.type));
etName.setEnabled(folder == null);
cbPoll.setEnabled(cbSynchronize.isChecked());
btnSave.setEnabled(true);
}

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

@ -752,11 +752,12 @@ public class FragmentIdentity extends FragmentEx {
@Override
protected Void onLoad(Context context, Bundle args) {
long id = args.getLong("id");
DB db = DB.getInstance(context);
EntityIdentity identity = db.identity().getIdentity(id);
db.identity().deleteIdentity(id);
if (identity.synchronize)
db.identity().setIdentityTbd(id);
ServiceSynchronize.reload(getContext(), "delete identity");
return null;
}

26
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
Unescape View File

@ -1796,7 +1796,13 @@ public class ServiceSynchronize extends LifecycleService {
List<String> names = new ArrayList<>();
for (EntityFolder folder : db.folder().getUserFolders(account.id))
if (folder.tbd == null)
names.add(folder.name);
else {
IMAPFolder ifolder = (IMAPFolder) istore.getFolder(folder.name);
ifolder.delete(false);
db.folder().deleteFolder(folder.id);
}
Log.i(Helper.TAG, "Local folder count=" + names.size());
Folder defaultFolder = istore.getDefaultFolder();
@ -1835,10 +1841,11 @@ public class ServiceSynchronize extends LifecycleService {
}
}
Log.i(Helper.TAG, "Delete local folder=" + names.size());
Log.i(Helper.TAG, "Create remote count=" + names.size());
for (String name : names) {
db.folder().deleteFolder(account.id, name);
Log.i(Helper.TAG, name + " deleted");
Log.i(Helper.TAG, name + " create");
IMAPFolder ifolder = (IMAPFolder) istore.getFolder(name);
ifolder.create(Folder.HOLDS_MESSAGES);
}
db.setTransactionSuccessful();
@ -2318,9 +2325,6 @@ public class ServiceSynchronize extends LifecycleService {
private boolean started = false;
private int queued = 0;
private long lastLost = 0;
PowerManager pm = getSystemService(PowerManager.class);
PowerManager.WakeLock wl = pm.newWakeLock(
PowerManager.PARTIAL_WAKE_LOCK, BuildConfig.APPLICATION_ID + ":manage");
private ExecutorService queue = Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
@Override
@ -2579,6 +2583,10 @@ public class ServiceSynchronize extends LifecycleService {
queued++;
queue.submit(new Runnable() {
PowerManager pm = getSystemService(PowerManager.class);
PowerManager.WakeLock wl = pm.newWakeLock(
PowerManager.PARTIAL_WAKE_LOCK, BuildConfig.APPLICATION_ID + ":manage");
@Override
public void run() {
try {
@ -2590,6 +2598,12 @@ public class ServiceSynchronize extends LifecycleService {
if (doStop)
stop();
DB db = DB.getInstance(ServiceSynchronize.this);
int accounts = db.account().deleteAccountsTbd();
int identities = db.identity().deleteIdentitiesTbd();
if (accounts > 0 || identities > 0)
Log.i(Helper.TAG, "Deleted accounts=" + accounts + " identities=" + identities);
if (doStart)
start();

4
app/src/main/res/layout/fragment_folder.xml
Unescape View File

@ -24,7 +24,7 @@
app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/etRename"
android:id="@+id/etName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"
@ -41,7 +41,7 @@
android:text="@string/title_display_name"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etRename" />
app:layout_constraintTop_toBottomOf="@id/etName" />
<EditText
android:id="@+id/etDisplay"

9
app/src/main/res/layout/item_account.xml
Unescape View File

@ -1,9 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/drawableItemBackground">
<View
android:id="@+id/vwColor"
android:layout_width="6dp"
@ -133,3 +139,4 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/marginBottom" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

3
app/src/main/res/layout/item_folder.xml
Unescape View File

@ -7,7 +7,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clItem"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:background="?attr/drawableItemBackground">
<View
android:id="@+id/vwColor"

9
app/src/main/res/layout/item_identity.xml
Unescape View File

@ -1,9 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/drawableItemBackground">
<View
android:id="@+id/vwColor"
android:layout_width="6dp"
@ -121,3 +127,4 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvError" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
Write Preview
Loading…
Cancel
Save