From 31a9049861b3b08e8e8c953818544e5d7013bef5 Mon Sep 17 00:00:00 2001 From: Josia Pietsch Date: Sat, 17 May 2025 11:42:21 +0200 Subject: [PATCH] try to mitigate #172 --- .../main/java/de/jrpie/android/launcher/ui/HomeActivity.kt | 7 ++++++- .../android/launcher/ui/widgets/WidgetPanelActivity.kt | 7 ++++++- .../launcher/ui/widgets/manage/ManageWidgetsActivity.kt | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt b/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt index 03c55fc..f3cde9a 100644 --- a/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt +++ b/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt @@ -122,7 +122,12 @@ class HomeActivity : UIObject, Activity() { } override fun onPause() { - (application as Application).appWidgetHost.stopListening() + try { + (application as Application).appWidgetHost.stopListening() + } catch (e: Exception) { + // Throws a NullPointerException on Android 12 an earlier, see #172 + e.printStackTrace() + } super.onPause() } diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/widgets/WidgetPanelActivity.kt b/app/src/main/java/de/jrpie/android/launcher/ui/widgets/WidgetPanelActivity.kt index ef7bf25..3c884db 100644 --- a/app/src/main/java/de/jrpie/android/launcher/ui/widgets/WidgetPanelActivity.kt +++ b/app/src/main/java/de/jrpie/android/launcher/ui/widgets/WidgetPanelActivity.kt @@ -62,7 +62,12 @@ class WidgetPanelActivity : Activity(), UIObject { } override fun onPause() { - (application as Application).appWidgetHost.stopListening() + try { + (application as Application).appWidgetHost.stopListening() + } catch (e: Exception) { + // Throws a NullPointerException on Android 12 an earlier, see #172 + e.printStackTrace() + } super.onPause() } diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/widgets/manage/ManageWidgetsActivity.kt b/app/src/main/java/de/jrpie/android/launcher/ui/widgets/manage/ManageWidgetsActivity.kt index 58b47be..984df85 100644 --- a/app/src/main/java/de/jrpie/android/launcher/ui/widgets/manage/ManageWidgetsActivity.kt +++ b/app/src/main/java/de/jrpie/android/launcher/ui/widgets/manage/ManageWidgetsActivity.kt @@ -93,7 +93,12 @@ class ManageWidgetsActivity : UIObject, Activity() { } override fun onPause() { - (application as Application).appWidgetHost.stopListening() + try { + (application as Application).appWidgetHost.stopListening() + } catch (e: Exception) { + // Throws a NullPointerException on Android 12 an earlier, see #172 + e.printStackTrace() + } super.onPause() }