Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-03 19:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify/fix reset order

Browse Source
This commit is contained in:
M66B
2019-05-10 20:50:03 +02:00
parent 51679a61b2
commit c94c40de06
4 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,6 +167,15 @@ public class AdapterOrder extends RecyclerView.Adapter<AdapterOrder.ViewHolder>
notifyItemMoved(from, to);
}
void onReset() {
List<EntityOrder> list = new ArrayList<>();
for (EntityOrder item : items) {
item.order = null;
list.add(item);
}
set(list);
}
@Override
@NonNull
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {

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

@@ -132,9 +132,6 @@ public interface DaoAccount {
@Query("UPDATE account SET last_connected = NULL")
int clearAccountConnected();
@Query("UPDATE account SET `order` = NULL")
int resetAccountOrder();
@Query("DELETE FROM account WHERE tbd = 1")
int deleteAccountsTbd();
}

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

@@ -236,9 +236,6 @@ public interface DaoFolder {
@Query("UPDATE folder SET read_only = :read_only WHERE id = :id")
int setFolderReadOnly(long id, boolean read_only);
@Query("UPDATE folder SET `order` = NULL")
int resetFolderOrder();
@Query("UPDATE folder SET tbc = null WHERE id = :id")
int resetFolderTbc(long id);

33
app/src/main/java/eu/faircode/email/FragmentOrder.java
View File

@@ -93,8 +93,6 @@ public class FragmentOrder extends FragmentBase {
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
DB db = DB.getInstance(getContext());
if (EntityAccount.class.getName().equals(clazz))
new SimpleTask<List<EntityAccount>>() {
@Override
@@ -216,36 +214,7 @@ public class FragmentOrder extends FragmentBase {
}
private void onMenuResetOrder() {
Bundle args = new Bundle();
args.putString("class", clazz);
new SimpleTask<Void>() {
@Override
protected Void onExecute(Context context, Bundle args) {
String clazz = args.getString("class");
DB db = DB.getInstance(context);
if (EntityAccount.class.getName().equals(clazz))
db.account().resetAccountOrder();
else if (TupleFolderSort.class.getName().equals(clazz))
db.folder().resetFolderOrder();
else
throw new IllegalArgumentException("Unknown class=" + clazz);
return null;
}
@Override
protected void onExecuted(Bundle args, Void data) {
dirty = false;
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
}
}.execute(this, args, "order:reset");
adapter.onReset();
}
private ItemTouchHelper.Callback touchHelper = new ItemTouchHelper.Callback() {