Different name for dev edition

Also addresses #10.
FliegendeWurst · Dec 9, 2024 · 96850d2 · 96850d2
1 parent a6c65b8
commit 96850d2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -23,8 +23,6 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-
-            buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
         }
         debug {
             applicationIdSuffix ".debug"

diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Trilium Notes dev</string>
+</resources>
diff --git a/app/src/main/kotlin/eu/fliegendewurst/triliumdroid/Cache.kt b/app/src/main/kotlin/eu/fliegendewurst/triliumdroid/Cache.kt
@@ -635,7 +635,7 @@ object Cache {
 		// first, verify correct sync version
 		ConnectionUtil.getAppInfo {
 			if (it != null) {
-				if (it.syncVersion == CacheDbHelper.SYNC_VERSION && it.dbVersion == CacheDbHelper.DATABASE_VERSION) {
+				if ((it.syncVersion == CacheDbHelper.SYNC_VERSION || it.syncVersion == CacheDbHelper.SYNC_VERSION_0_63_3) && it.dbVersion == CacheDbHelper.DATABASE_VERSION) {
 					sync(0, callbackOutstanding, callbackError, callbackDone)
 				} else {
 					Log.e(TAG, "mismatched sync / database version")