X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fdao%2FTemplateHeaderDAO.java;h=f72104b31514c5a4fbbfac813662c3588cb285f2;hb=40d4f7ebb9085a58133cf47eacf989ed35fa0b4e;hp=2d3d7ee48884eb3012218dcb70f1322d3fb8d793;hpb=3aef8f6c15117aa4ea9abd687ad2c69e0f1f25bb;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/dao/TemplateHeaderDAO.java b/app/src/main/java/net/ktnx/mobileledger/dao/TemplateHeaderDAO.java
index 2d3d7ee4..f72104b3 100644
--- a/app/src/main/java/net/ktnx/mobileledger/dao/TemplateHeaderDAO.java
+++ b/app/src/main/java/net/ktnx/mobileledger/dao/TemplateHeaderDAO.java
@@ -18,8 +18,6 @@
 package net.ktnx.mobileledger.dao;
 
 import android.os.AsyncTask;
-import android.os.Handler;
-import android.os.Looper;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -36,6 +34,7 @@ import net.ktnx.mobileledger.db.DB;
 import net.ktnx.mobileledger.db.TemplateAccount;
 import net.ktnx.mobileledger.db.TemplateHeader;
 import net.ktnx.mobileledger.db.TemplateWithAccounts;
+import net.ktnx.mobileledger.utils.Misc;
 
 import java.util.List;
 
@@ -47,9 +46,8 @@ public abstract class TemplateHeaderDAO {
     public void insertAsync(@NonNull TemplateHeader item, @Nullable Runnable callback) {
         AsyncTask.execute(() -> {
             insertSync(item);
-            if (callback != null) {
-                new Handler(Looper.getMainLooper()).post(callback);
-            }
+            if (callback != null)
+                Misc.onMainThread(callback);
         });
     }
 
@@ -62,11 +60,11 @@ public abstract class TemplateHeaderDAO {
     public void deleteAsync(@NonNull TemplateHeader item, @NonNull Runnable callback) {
         AsyncTask.execute(() -> {
             deleteSync(item);
-            new Handler(Looper.getMainLooper()).post(callback);
+            Misc.onMainThread(callback);
         });
     }
 
-    @Query("SELECT * FROM templates ORDER BY UPPER(name)")
+    @Query("SELECT * FROM templates ORDER BY is_fallback, UPPER(name)")
     public abstract LiveData<List<TemplateHeader>> getTemplates();
 
     @Query("SELECT * FROM templates WHERE id = :id")
@@ -106,7 +104,7 @@ public abstract class TemplateHeaderDAO {
         }
     }
 
-    public void getTemplateWitAccountsAsync(@NonNull Long id, @NonNull
+    public void getTemplateWithAccountsAsync(@NonNull Long id, @NonNull
             AsyncResultCallback<TemplateWithAccounts> callback) {
         LiveData<TemplateWithAccounts> resultReceiver = getTemplateWithAccounts(id);
         resultReceiver.observeForever(new Observer<TemplateWithAccounts>() {
@@ -123,9 +121,8 @@ public abstract class TemplateHeaderDAO {
     public void insertAsync(@NonNull TemplateWithAccounts item, @Nullable Runnable callback) {
         AsyncTask.execute(() -> {
             insertSync(item);
-            if (callback != null) {
-                new Handler(Looper.getMainLooper()).post(callback);
-            }
+            if (callback != null)
+                Misc.onMainThread(callback);
         });
     }
     public void duplicateTemplateWitAccounts(@NonNull Long id, @Nullable
@@ -142,7 +139,7 @@ public abstract class TemplateHeaderDAO {
                 dupAcc.setId(accDao.insertSync(dupAcc));
             }
             if (callback != null)
-                new Handler(Looper.getMainLooper()).post(() -> callback.onResult(dup));
+                Misc.onMainThread(() -> callback.onResult(dup));
         });
     }