Merge pull request #211 from SecUSo/development

Update to version 4.5.8

app/build.gradle

@@ -12,8 +12,8 @@ android {
         compileSdk 34
         targetSdkVersion 34
         multiDexEnabled true
-        versionCode 38
-        versionName "4.5.7"
+        versionCode 39
+        versionName "4.5.8"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         buildFeatures.dataBinding = true
         vectorDrawables.useSupportLibrary = true

app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/QuickTileService.kt

@@ -1,5 +1,6 @@
 package com.secuso.privacyfriendlycodescanner.qrscanner
 
+import android.app.PendingIntent
 import android.content.Intent
 import android.os.Build
 import android.service.quicksettings.TileService
@@ -13,7 +14,12 @@ class QuickTileService : TileService() {
 
         val intent = Intent(this, ScannerActivity::class.java)
             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        val pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE)
 
-        startActivityAndCollapse(intent)
+        if (Build.VERSION.SDK_INT >= 34) {
+            startActivityAndCollapse(pendingIntent)
+        } else {
+            startActivityAndCollapse(intent)
+        }
     }
 }

app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/database/Converters.kt

@@ -0,0 +1,77 @@
+package com.secuso.privacyfriendlycodescanner.qrscanner.database
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.util.Base64
+import androidx.room.TypeConverter
+import com.google.gson.Gson
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.ResultPoint
+import java.io.ByteArrayOutputStream
+
+/**
+ * This class offers type converters for the room database.
+ *
+ * @author Christopher Beckmann
+ * @see AppDatabase
+ */
+object Converters {
+    @JvmStatic
+    @TypeConverter
+    fun encodeImage(bitmap: Bitmap?): String? {
+        if (bitmap == null) return null
+        val byteArrayOutputStream = ByteArrayOutputStream()
+        bitmap.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream)
+        val byteArray = byteArrayOutputStream.toByteArray()
+        return Base64.encodeToString(byteArray, Base64.NO_WRAP)
+    }
+
+    @JvmStatic
+    @TypeConverter
+    fun decodeImage(encodedImage: String?): Bitmap? {
+        if (encodedImage == null) return null
+        val decodedBytes = Base64.decode(encodedImage, Base64.NO_WRAP)
+        return BitmapFactory.decodeByteArray(decodedBytes, 0, decodedBytes.size)
+    }
+
+    @JvmStatic
+    @TypeConverter
+    fun fromText(text: String?): BarcodeFormat? {
+        return try {
+            BarcodeFormat.valueOf(text!!)
+        } catch (e: IllegalArgumentException) {
+            null
+        } catch (e: NullPointerException) {
+            null
+        }
+    }
+
+    @JvmStatic
+    @TypeConverter
+    fun fromBarcodeFormat(bcf: BarcodeFormat): String {
+        return bcf.name
+    }
+
+    @JvmStatic
+    @TypeConverter
+    fun fromResultPoints(rp: Array<ResultPoint?>?): String? {
+        val gson = Gson()
+        return gson.toJson(rp)
+    }
+
+    @JvmStatic
+    @TypeConverter
+    fun convertResultPointFromJson(jsonString: String?): Array<ResultPoint?>? {
+        val gson = Gson()
+        return gson.fromJson(jsonString, Array<ResultPoint?>::class.java)
+    }
+
+    fun dpFromPx(context: Context, px: Float): Float {
+        return px / context.resources.displayMetrics.density
+    }
+
+    fun pxFromDp(context: Context, dp: Float): Float {
+        return dp * context.resources.displayMetrics.density
+    }
+}