Merge pull request #11 from veryfi/feature/LP-157-update-version-1.6.2.4

Update lens version to 1.6.2.4
veryfi · Dec 26, 2022 · 4562aa4 · 4562aa4
2 parents 4a826f9 + 108139e
commit 4562aa4
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -39,7 +39,7 @@ android {
     buildTypes {
         debug {
             minifyEnabled true
-            shrinkResources true
+            shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -50,7 +50,7 @@ dependencies {
     //noinspection GradleDependency
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.veryfi.lens:veryfi-lens-receipts-sdk:1.6.2.3'
+    implementation 'com.veryfi.lens:veryfi-lens-receipts-sdk:1.6.2.4'
     implementation 'com.google.android.material:material:1.7.0'
     implementation 'com.github.martin-stone:hsv-alpha-color-picker-android:3.0.1'
     implementation 'com.github.lriccardo:TimelineView:1.1.2'

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -90,7 +90,6 @@
 -keep class com.veryfi.lens.helpers.VeryfiLensCredentials {public *;}
 -keepclassmembers class com.veryfi.lens.helpers.VeryfiLensCredentials { *; }
 -keep class com.veryfi.lens.helpers.ExportLogsHelper {public *;}
--keepclassmembers class com.veryfi.lens.helpers.ExportLogsHelper { *; }
 -keep class com.veryfi.lens.helpers.VeryfiLensSettings {public *;}
 -keepclassmembers class com.veryfi.lens.helpers.VeryfiLensSettings { *; }
 -keep class com.veryfi.lens.helpers.VeryfiLensSettings {public *;}
@@ -131,10 +130,6 @@
 -keep class com.veryfi.lens.helpers.database.ProcessData {public *;}
 -keepclassmembers class com.veryfi.lens.helpers.database.ProcessData { *; }
 
--keep class com.veryfi.lens.cpp.ExportLogsCpp
--keep class com.veryfi.lens.cpp.ExportLogsCpp {public *;}
--keepclassmembers class com.veryfi.lens.cpp.ExportLogsCpp { *; }
-
 
 # eventbus
 -keepattributes *Annotation*
@@ -150,4 +145,36 @@
 -keepclassmembers enum * { public static **[] values(); public static ** valueOf(java.lang.String); }
 -keepclassmembers enum * { *; }
 
--keep class androidx.databinding.** { *; }
+-keep class androidx.databinding.** { *; }
+
+-keep class com.veryfi.lens.cpp.ExportLogsCpp
+-keep class com.veryfi.lens.cpp.ExportLogsCpp {public *;}
+-keepclassmembers class com.veryfi.lens.cpp.ExportLogsCpp { *; }
+
+-keep class com.veryfi.lens.cpp.AutoCaptureResult
+-keep class com.veryfi.lens.cpp.AutoCaptureResult {public *;}
+-keepclassmembers class com.veryfi.lens.cpp.AutoCaptureResult { *; }
+
+-keep class com.veryfi.lens.cpp.AutoCaptureState
+-keep class com.veryfi.lens.cpp.AutoCaptureState {public *;}
+-keepclassmembers class com.veryfi.lens.cpp.AutoCaptureState { *; }
+
+-keep class com.veryfi.lens.cpp.TextReaderResult
+-keep class com.veryfi.lens.cpp.TextReaderResult {public *;}
+-keepclassmembers class com.veryfi.lens.cpp.TextReaderResult { *; }
+
+-keep class org.opencv.core.Mat
+-keep class org.opencv.core.Mat { public *; }
+-keepclassmembers class org.opencv.core.Mat { *; }
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/veryfi/lens/receipts/demo/logs/LogsActivity.kt b/app/src/main/java/com/veryfi/lens/receipts/demo/logs/LogsActivity.kt
@@ -77,8 +77,7 @@ class LogsActivity : AppCompatActivity() {
         val gson = GsonBuilder().setPrettyPrinting().create()
         val prettyJsonString = gson.toJson(jsonElement)
         log.message = prettyJsonString
-        val status = json.getString(STATUS)
-
+        val status = if (json.has(STATUS)) json.getString(STATUS) else ""
         when (status) {
             START -> log.title = resources.getString(R.string.logs_start_uploading)
             IN_PROGRESS -> {
@@ -96,6 +95,7 @@ class LogsActivity : AppCompatActivity() {
             EXCEPTION -> log.title = resources.getString(R.string.logs_exception)
             ERROR -> log.title = resources.getString(R.string.logs_error)
             FAILED -> log.title = resources.getString(R.string.logs_failed)
+            else -> log.title = "Other"
         }
 
         if (!status.equals(CLOSE)) {