Skip to content

Commit

Permalink
Bump compile sdk to 34
Browse files Browse the repository at this point in the history
Signed-off-by: mueller-ma <[email protected]>
  • Loading branch information
mueller-ma committed Oct 19, 2023
1 parent 2ba26cf commit ab0d9cf
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions mobile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ if (!isFoss) {
}

android {
buildToolsVersion '33.0.2'
compileSdkVersion 33
buildToolsVersion '34.0.0'
useLibrary "org.apache.http.legacy"
namespace 'org.openhab.habdroid'

defaultConfig {
applicationId "org.openhab.habdroid"
minSdkVersion 21
compileSdk 34
targetSdkVersion 33
versionCode 499
versionName "3.7.6-beta"
Expand Down
1 change: 1 addition & 0 deletions mobile/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@

<service
android:name=".background.EventListenerService"
android:foregroundServiceType="dataSync"
android:enabled="true"
android:exported="false" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,9 @@ class BackgroundTasksManager : BroadcastReceiver() {

private class PrefsListener constructor(private val context: Context) :
SharedPreferences.OnSharedPreferenceChangeListener {
override fun onSharedPreferenceChanged(prefs: SharedPreferences, key: String) {
override fun onSharedPreferenceChanged(prefs: SharedPreferences, key: String?) {
when {
key == null -> return
key == PrefKeys.DEMO_MODE && prefs.isDemoModeEnabled() -> {
// Demo mode was enabled -> cancel all uploads and clear DB
// to clear out notifications
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ class ConnectionFactory internal constructor(
}
}

override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
if (key == PrefKeys.DEBUG_MESSAGES) {
updateHttpLoggerSettings()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ abstract class ContentController protected constructor(private val activity: Mai
}

fun showWebViewUi(ui: WebViewUi, isStackRoot: Boolean, subpage: String?) {
val webViewFragment = ui.fragment.newInstance()
val webViewFragment = ui.fragment.getDeclaredConstructor().newInstance()
webViewFragment.arguments = bundleOf(
KEY_IS_STACK_ROOT to isStackRoot,
KEY_SUBPAGE to subpage
Expand Down

0 comments on commit ab0d9cf

Please sign in to comment.