2020-01-14 Version 1.0.1: Fixed OrmLite configuration issues

fartem · Jan 14, 2020 · 466d8e8 · 466d8e8
1 parent f7818eb
commit 466d8e8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.0"
+        versionName "1.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/...main/java/com/smlnskgmail/jaman/ormlitedatabackup/logic/ormlite/OrmLiteHelperFactory.java b/...main/java/com/smlnskgmail/jaman/ormlitedatabackup/logic/ormlite/OrmLiteHelperFactory.java
@@ -10,39 +10,39 @@
 @SuppressLint("StaticFieldLeak")
 public class OrmLiteHelperFactory {
 
-    private static OrmLiteDatabaseHelper ORMLiteDatabaseHelper;
+    private static OrmLiteDatabaseHelper ormLiteDatabaseHelper;
 
-    private static OrmLiteDatabaseParameters ORMLiteDatabaseParameters;
+    private static OrmLiteDatabaseParameters ormLiteDatabaseParameters;
 
     private OrmLiteHelperFactory(@NonNull OrmLiteDatabaseHelper ormLiteDatabaseHelper) {
-        this.ORMLiteDatabaseHelper = ormLiteDatabaseHelper;
+        OrmLiteHelperFactory.ormLiteDatabaseHelper = ormLiteDatabaseHelper;
     }
 
     public static void setHelper(@NonNull Context context) {
-        if (ORMLiteDatabaseHelper != null) {
+        if (ormLiteDatabaseHelper != null) {
             releaseHelper();
         }
-        ORMLiteDatabaseHelper = OpenHelperManager.getHelper(context, OrmLiteDatabaseHelper.class);
+        ormLiteDatabaseHelper = OpenHelperManager.getHelper(context, OrmLiteDatabaseHelper.class);
     }
 
     public static OrmLiteDatabaseHelper databaseHelper() {
-        return ORMLiteDatabaseHelper;
+        return ormLiteDatabaseHelper;
     }
 
     public static void releaseHelper() {
         OpenHelperManager.releaseHelper();
-        ORMLiteDatabaseHelper = null;
+        ormLiteDatabaseHelper = null;
     }
 
     public static OrmLiteDatabaseParameters databaseParameters() {
-        if (ORMLiteDatabaseParameters == null) {
-            String databaseName = ORMLiteDatabaseHelper.databaseName();
-            ORMLiteDatabaseParameters = new OrmLiteDatabaseParameters(
-                    ORMLiteDatabaseHelper.context(),
+        if (ormLiteDatabaseParameters == null) {
+            String databaseName = ormLiteDatabaseHelper.databaseName();
+            ormLiteDatabaseParameters = new OrmLiteDatabaseParameters(
+                    ormLiteDatabaseHelper.context(),
                     databaseName
             );
         }
-        return ORMLiteDatabaseParameters;
+        return ormLiteDatabaseParameters;
     }
 
 }
diff --git a/app/src/main/res/raw/ormlite_config.txt b/app/src/main/res/raw/ormlite_config.txt
@@ -1,8 +1,9 @@
 #
-# generated on 2019/12/06 08:51:17
+# generated on 2020/01/14 08:45:06
 #
+#################################
 # --table-start--
-dataClass=com.smlnskgmail.jaman.ormlitedatabackup.logic.db.entities.Event
+dataClass=com.smlnskgmail.jaman.ormlitedatabackup.logic.ormlite.entities.Event
 tableName=event
 # --table-fields-start--
 # --field-start--
@@ -21,3 +22,4 @@ generatedId=true
 # --field-end--
 # --table-fields-end--
 # --table-end--
+#################################