* target to android 12 (sdk 31)

allgood · Jun 4, 2022 · 76022e5 · 76022e5
1 parent a032508
commit 76022e5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,18 +2,18 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
+    compileSdk 31
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
         jvmTarget = '1.8'
     }
     defaultConfig {
         applicationId "com.todobom.opennotescanner"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdk 31
         versionCode 36
         versionName '1.0.36'
     }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -29,6 +29,7 @@
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/title_activity_open_note_scanner"
             android:screenOrientation="portrait"
+            android:exported="true"
             android:theme="@style/FullscreenTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -46,6 +47,7 @@
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/title_activity_gallery"
             android:screenOrientation="portrait"
+            android:exported="true"
             android:theme="@style/FullscreenTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/com/todobom/opennotescanner/helpers/Utils.kt b/app/src/main/java/com/todobom/opennotescanner/helpers/Utils.kt
@@ -193,7 +193,7 @@ class Utils(
         }
 
         @JvmStatic
-        fun isPackageInstalled(context: Context, packagename: String?): Boolean {
+        fun isPackageInstalled(context: Context, packagename: String): Boolean {
             val pm = context.packageManager
             var app_installed = false
             app_installed = try {

diff --git a/app/src/main/java/com/todobom/opennotescanner/views/TagEditorFragment.kt b/app/src/main/java/com/todobom/opennotescanner/views/TagEditorFragment.kt
@@ -1,6 +1,5 @@
 package com.todobom.opennotescanner.views
 
-import android.app.Activity
 import android.content.res.ColorStateList
 import android.media.ExifInterface
 import android.os.Bundle
@@ -62,29 +61,29 @@ class TagEditorFragment : DialogFragment() {
     private fun loadTags() {
         var exif: ExifInterface? = null
         try {
-            exif = ExifInterface(filePath)
+            exif = ExifInterface(filePath!!)
         } catch (e: IOException) {
             e.printStackTrace()
         }
         val userComment = exif!!.getAttribute("UserComment")
         for (i in 0..6) {
-            stdTagsState[i] = userComment.contains("<" + stdTags[i] + ">")
+            stdTagsState[i] = userComment!!.contains("<" + stdTags[i] + ">")
         }
     }
 
     private fun saveTags() {
         var exif: ExifInterface? = null
         try {
-            exif = ExifInterface(filePath)
+            exif = ExifInterface(filePath!!)
         } catch (e: IOException) {
             e.printStackTrace()
         }
         var userComment = exif!!.getAttribute("UserComment")
         for (i in 0..6) {
-            if (stdTagsState[i] && !userComment.contains("<" + stdTags[i] + ">")) {
+            if (stdTagsState[i] && !userComment!!.contains("<" + stdTags[i] + ">")) {
                 userComment += "<" + stdTags[i] + ">"
-            } else if (!stdTagsState[i] && userComment.contains("<" + stdTags[i] + ">")) {
-                userComment.replace("<" + stdTags[i] + ">".toRegex(), "")
+            } else if (!stdTagsState[i] && userComment!!.contains("<" + stdTags[i] + ">")) {
+                userComment!!.replace("<" + stdTags[i] + ">".toRegex(), "")
             }
         }
         exif.setAttribute("UserComment", userComment)