Repair crash on Android 14 #2067

klassm · Oct 14, 2023 · b084c77 · b084c77
1 parent e49603b
commit b084c77
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 7 deletions.
diff --git a/app/src/main/java/li/klass/fhem/activities/AndFHEMMainActivity.kt b/app/src/main/java/li/klass/fhem/activities/AndFHEMMainActivity.kt
@@ -35,6 +35,7 @@ import android.content.Intent.ACTION_SEARCH
 import android.content.Intent.ACTION_VIEW
 import android.content.IntentFilter
 import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.view.LayoutInflater
@@ -211,7 +212,15 @@ open class AndFHEMMainActivity : AppCompatActivity() {
             }
 
             broadcastReceiver = Receiver()
-            registerReceiver(broadcastReceiver, broadcastReceiver!!.intentFilter)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                registerReceiver(
+                    broadcastReceiver,
+                    broadcastReceiver!!.intentFilter,
+                    RECEIVER_NOT_EXPORTED
+                )
+            } else {
+                registerReceiver(broadcastReceiver, broadcastReceiver!!.intentFilter)
+            }
 
             initDrawerLayout()
 
@@ -374,7 +383,15 @@ open class AndFHEMMainActivity : AppCompatActivity() {
                     saveInstanceStateCalled = false
 
                     if (broadcastReceiver != null) {
-                        registerReceiver(broadcastReceiver, broadcastReceiver!!.intentFilter)
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                            registerReceiver(
+                                broadcastReceiver,
+                                broadcastReceiver!!.intentFilter,
+                                RECEIVER_NOT_EXPORTED
+                            )
+                        } else {
+                            registerReceiver(broadcastReceiver, broadcastReceiver!!.intentFilter)
+                        }
                     }
 
                     if (availableConnectionDataAdapter != null) {

diff --git a/app/src/main/java/li/klass/fhem/device/control/AndroidControlsProviderService.kt b/app/src/main/java/li/klass/fhem/device/control/AndroidControlsProviderService.kt
@@ -73,7 +73,15 @@ class AndroidControlsProviderService : ControlsProviderService() {
             }
 
         }
-        registerReceiver(broadcastReceiver, IntentFilter(Actions.DEVICES_UPDATED))
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            registerReceiver(
+                broadcastReceiver,
+                IntentFilter(Actions.DEVICES_UPDATED),
+                RECEIVER_NOT_EXPORTED
+            )
+        } else {
+            registerReceiver(broadcastReceiver, IntentFilter(Actions.DEVICES_UPDATED))
+        }
     }
 
     override fun onDestroy() {

diff --git a/app/src/main/java/li/klass/fhem/fragments/core/BaseFragment.kt b/app/src/main/java/li/klass/fhem/fragments/core/BaseFragment.kt
@@ -26,16 +26,26 @@ package li.klass.fhem.fragments.core
 
 import android.content.BroadcastReceiver
 import android.content.Context
+import android.content.Context.RECEIVER_NOT_EXPORTED
 import android.content.Intent
 import android.content.IntentFilter
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.*
+import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import android.widget.RelativeLayout
+import android.widget.TextView
 import androidx.fragment.app.Fragment
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Runnable
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import li.klass.fhem.R
 import li.klass.fhem.activities.core.Updateable
 import li.klass.fhem.constants.Actions
@@ -245,7 +255,11 @@ abstract class BaseFragment : Fragment(), Updateable, Serializable, SwipeRefresh
         }
 
         fun attach() {
-            activity.registerReceiver(this, intentFilter)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                activity.registerReceiver(this, intentFilter, RECEIVER_NOT_EXPORTED)
+            } else {
+                activity.registerReceiver(this, intentFilter)
+            }
         }
 
         fun detach() {
@@ -254,7 +268,6 @@ abstract class BaseFragment : Fragment(), Updateable, Serializable, SwipeRefresh
             } catch (e: IllegalArgumentException) {
                 Log.e(UIBroadcastReceiver::class.java.name, "error while detaching", e)
             }
-
         }
     }