diff --git a/app/build.gradle b/app/build.gradle index 595888e1..c359eed0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ plugins { apply plugin: 'com.google.android.gms.oss-licenses-plugin' -def tagName = '1.8.1' -def tagCode = 181 +def tagName = '1.8.2' +def tagCode = 182 android { compileSdk 34 diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm index c516e0db..4714d194 100644 Binary files a/app/release/baselineProfiles/0/app-release.dm and b/app/release/baselineProfiles/0/app-release.dm differ diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm index c0909eba..35a2ab01 100644 Binary files a/app/release/baselineProfiles/1/app-release.dm and b/app/release/baselineProfiles/1/app-release.dm differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 344c5818..dec9e826 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 180, - "versionName": "1.8", + "versionCode": 182, + "versionName": "1.8.2", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/android/widget/SmartspacerAppWidgetHost.kt b/app/src/main/java/android/widget/SmartspacerAppWidgetHost.kt index 43cc07ed..0be5ffe0 100644 --- a/app/src/main/java/android/widget/SmartspacerAppWidgetHost.kt +++ b/app/src/main/java/android/widget/SmartspacerAppWidgetHost.kt @@ -6,7 +6,7 @@ import android.appwidget.AppWidgetProviderInfo import android.content.Context import android.content.IntentSender import android.widget.SmartspacerAppWidgetHost.ProxyAppWidgetHostListener -import com.kieronquinn.app.smartspacer.utils.extensions.getIntentSenderForConfigureActivityCompat +import com.kieronquinn.app.smartspacer.utils.extensions.getIntentSenderForConfigureActivityCompatInternal /** * AppWidgetHost which supports multiple of the same App Widget ID, by intercepting requests to @@ -32,8 +32,8 @@ abstract class SmartspacerAppWidgetHost(context: Context, id: Int): AppWidgetHos proxyListeners[appWidgetId]?.removeProxyListener(view as AppWidgetHostListener) } - fun getIntentSenderForConfigureActivity(appWidgetId: Int, intentFlags: Int): IntentSender { - return getIntentSenderForConfigureActivityCompat(appWidgetId, intentFlags) + fun getIntentSenderForConfigureActivityCompat(appWidgetId: Int, intentFlags: Int): IntentSender { + return getIntentSenderForConfigureActivityCompatInternal(appWidgetId, intentFlags) } private class ProxyAppWidgetHostListener: AppWidgetHostListener { diff --git a/app/src/main/java/android/widget/SmartspacerAppWidgetHostCompat.kt b/app/src/main/java/android/widget/SmartspacerAppWidgetHostCompat.kt index ae53262c..327fcbe7 100644 --- a/app/src/main/java/android/widget/SmartspacerAppWidgetHostCompat.kt +++ b/app/src/main/java/android/widget/SmartspacerAppWidgetHostCompat.kt @@ -421,7 +421,7 @@ open class SmartspacerAppWidgetHostCompat @JvmOverloads constructor( } } - fun getIntentSenderForConfigureActivity(appWidgetId: Int, intentFlags: Int = 0): IntentSender { + fun getIntentSenderForConfigureActivityCompat(appWidgetId: Int, intentFlags: Int = 0): IntentSender { return sService.createAppWidgetConfigIntentSender( BuildConfig.APPLICATION_ID, appWidgetId, intentFlags ) diff --git a/app/src/main/java/com/kieronquinn/app/smartspacer/repositories/AnalyticsRepository.kt b/app/src/main/java/com/kieronquinn/app/smartspacer/repositories/AnalyticsRepository.kt index decfb8e9..5d2901fb 100644 --- a/app/src/main/java/com/kieronquinn/app/smartspacer/repositories/AnalyticsRepository.kt +++ b/app/src/main/java/com/kieronquinn/app/smartspacer/repositories/AnalyticsRepository.kt @@ -4,7 +4,7 @@ import android.content.Context import android.os.Build import com.google.firebase.analytics.FirebaseAnalytics import com.google.firebase.crashlytics.FirebaseCrashlytics -import com.google.firebase.crashlytics.ktx.setCustomKeys +import com.google.firebase.crashlytics.setCustomKeys import kotlinx.coroutines.MainScope import kotlinx.coroutines.launch @@ -26,7 +26,7 @@ class AnalyticsRepositoryImpl( settingsRepository.analyticsEnabled.asFlow().collect { FirebaseAnalytics.getInstance(context).setAnalyticsCollectionEnabled(it) FirebaseCrashlytics.getInstance().apply { - setCrashlyticsCollectionEnabled(false) + setCrashlyticsCollectionEnabled(it) setupCrashlytics() } } diff --git a/app/src/main/java/com/kieronquinn/app/smartspacer/repositories/ExpandedRepository.kt b/app/src/main/java/com/kieronquinn/app/smartspacer/repositories/ExpandedRepository.kt index 7f0f166d..11b62c4a 100644 --- a/app/src/main/java/com/kieronquinn/app/smartspacer/repositories/ExpandedRepository.kt +++ b/app/src/main/java/com/kieronquinn/app/smartspacer/repositories/ExpandedRepository.kt @@ -14,7 +14,6 @@ import android.os.Build import android.os.Bundle import android.os.Parcelable import android.os.Process -import android.util.Log import android.view.ViewGroup import androidx.core.os.bundleOf import com.google.gson.annotations.SerializedName @@ -322,7 +321,7 @@ class ExpandedRepositoryImpl( } override fun createConfigIntentSender(appWidgetId: Int): IntentSender { - return appWidgetHost.getIntentSenderForConfigureActivity(appWidgetId, 0) + return appWidgetHost.getIntentSenderForConfigureActivityCompat(appWidgetId, 0) } override fun createHost( diff --git a/app/src/main/java/com/kieronquinn/app/smartspacer/repositories/WidgetRepository.kt b/app/src/main/java/com/kieronquinn/app/smartspacer/repositories/WidgetRepository.kt index 9cec6ed2..e888c0a7 100644 --- a/app/src/main/java/com/kieronquinn/app/smartspacer/repositories/WidgetRepository.kt +++ b/app/src/main/java/com/kieronquinn/app/smartspacer/repositories/WidgetRepository.kt @@ -229,7 +229,7 @@ class WidgetRepositoryImpl( } override fun createConfigIntentSender(appWidgetId: Int): IntentSender { - return appWidgetHost.getIntentSenderForConfigureActivity(appWidgetId, 0) + return appWidgetHost.getIntentSenderForConfigureActivityCompat(appWidgetId, 0) } override fun clickAppWidgetIdView(appWidgetId: Int, identifier: String?, id: Int?) { diff --git a/app/src/main/java/com/kieronquinn/app/smartspacer/utils/extensions/Extensions+AppWidgetHost.kt b/app/src/main/java/com/kieronquinn/app/smartspacer/utils/extensions/Extensions+AppWidgetHost.kt index ee0fb04e..a17587c3 100644 --- a/app/src/main/java/com/kieronquinn/app/smartspacer/utils/extensions/Extensions+AppWidgetHost.kt +++ b/app/src/main/java/com/kieronquinn/app/smartspacer/utils/extensions/Extensions+AppWidgetHost.kt @@ -10,7 +10,7 @@ import com.android.internal.appwidget.IAppWidgetService import com.kieronquinn.app.smartspacer.BuildConfig @SuppressLint("DiscouragedPrivateApi") -fun AppWidgetHost.getIntentSenderForConfigureActivityCompat( +fun AppWidgetHost.getIntentSenderForConfigureActivityCompatInternal( appWidgetId: Int, intentFlags: Int ): IntentSender { val sService = AppWidgetHost::class.java.getDeclaredField("sService").apply { diff --git a/app/src/main/java/com/kieronquinn/app/smartspacer/widget/ExpandedAppWidgetHost.kt b/app/src/main/java/com/kieronquinn/app/smartspacer/widget/ExpandedAppWidgetHost.kt index d4b86437..8d76a5e4 100644 --- a/app/src/main/java/com/kieronquinn/app/smartspacer/widget/ExpandedAppWidgetHost.kt +++ b/app/src/main/java/com/kieronquinn/app/smartspacer/widget/ExpandedAppWidgetHost.kt @@ -109,7 +109,7 @@ interface AppWidgetHost { fun allocateAppWidgetId(): Int fun deleteAppWidgetId(appWidgetId: Int) fun startListening() - fun getIntentSenderForConfigureActivity(appWidgetId: Int, intentFlags: Int): IntentSender + fun getIntentSenderForConfigureActivityCompat(appWidgetId: Int, intentFlags: Int): IntentSender } diff --git a/app/src/main/java/com/kieronquinn/app/smartspacer/widget/HeadlessAppWidgetHost.kt b/app/src/main/java/com/kieronquinn/app/smartspacer/widget/HeadlessAppWidgetHost.kt index 1aad874c..bbbfce05 100644 --- a/app/src/main/java/com/kieronquinn/app/smartspacer/widget/HeadlessAppWidgetHost.kt +++ b/app/src/main/java/com/kieronquinn/app/smartspacer/widget/HeadlessAppWidgetHost.kt @@ -6,7 +6,7 @@ import android.appwidget.AppWidgetProviderInfo import android.content.Context import android.content.IntentSender import com.kieronquinn.app.smartspacer.ui.views.appwidget.HeadlessAppWidgetHostView -import com.kieronquinn.app.smartspacer.utils.extensions.getIntentSenderForConfigureActivityCompat +import com.kieronquinn.app.smartspacer.utils.extensions.getIntentSenderForConfigureActivityCompatInternal import com.kieronquinn.app.smartspacer.utils.extensions.removeListener class HeadlessAppWidgetHost( @@ -27,8 +27,8 @@ class HeadlessAppWidgetHost( onProvidersChangedListener.onProvidersChanged() } - fun getIntentSenderForConfigureActivity(appWidgetId: Int, intentFlags: Int): IntentSender { - return getIntentSenderForConfigureActivityCompat(appWidgetId, intentFlags) + fun getIntentSenderForConfigureActivityCompat(appWidgetId: Int, intentFlags: Int): IntentSender { + return getIntentSenderForConfigureActivityCompatInternal(appWidgetId, intentFlags) } fun destroyView(appWidgetHostView: AppWidgetHostView) {