From f974352c4aef2cd91e0cd07e7d93196cb40df9e0 Mon Sep 17 00:00:00 2001 From: Philipp Heckel Date: Fri, 18 Nov 2022 20:08:24 -0500 Subject: [PATCH] Update deps, hurray --- app/build.gradle | 13 ++++++------ .../io/heckel/ntfy/ui/SettingsActivity.kt | 21 +++++++------------ build.gradle | 4 ++-- 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 666cef4..6191561 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,6 @@ repositories { } apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' apply plugin: 'com.google.gms.google-services' @@ -67,7 +66,7 @@ android { dependencies { // AndroidX, The Basics - implementation "androidx.appcompat:appcompat:1.4.2" + implementation "androidx.appcompat:appcompat:1.5.1" implementation "androidx.core:core-ktx:1.9.0" implementation "androidx.constraintlayout:constraintlayout:2.1.4" implementation "androidx.activity:activity-ktx:1.6.1" @@ -79,18 +78,18 @@ dependencies { implementation 'com.google.code.gson:gson:2.10' // Room (SQLite) - def room_version = "2.4.2" + def room_version = "2.4.3" implementation "androidx.room:room-ktx:$room_version" kapt "androidx.room:room-compiler:$room_version" // OkHttp (HTTP library) - implementation 'com.squareup.okhttp3:okhttp:4.9.3' + implementation 'com.squareup.okhttp3:okhttp:4.10.0' // Firebase, sigh ... (only Google Play) - playImplementation 'com.google.firebase:firebase-messaging:23.0.5' + playImplementation 'com.google.firebase:firebase-messaging:23.1.0' // RecyclerView - implementation "androidx.recyclerview:recyclerview:1.3.0-alpha02" + implementation "androidx.recyclerview:recyclerview:1.3.0-rc01" // Swipe down to refresh implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' @@ -99,7 +98,7 @@ dependencies { implementation "com.google.android.material:material:1.6.1" // LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" implementation 'androidx.legacy:legacy-support-v4:1.0.0' // Image viewer diff --git a/app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt b/app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt index cd5f20c..cc6f882 100644 --- a/app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt +++ b/app/src/main/java/io/heckel/ntfy/ui/SettingsActivity.kt @@ -85,7 +85,7 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) - // Save current activity title so we can set it again after a configuration change + // Save current activity title, so we can set it again after a configuration change outState.putCharSequence(TITLE_TAG, title) } @@ -165,9 +165,8 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere return repository.getGlobalMutedUntil().toString() } } - mutedUntil?.summaryProvider = Preference.SummaryProvider { _ -> - val mutedUntilValue = repository.getGlobalMutedUntil() - when (mutedUntilValue) { + mutedUntil?.summaryProvider = Preference.SummaryProvider { + when (val mutedUntilValue = repository.getGlobalMutedUntil()) { Repository.MUTED_UNTIL_SHOW_ALL -> getString(R.string.settings_notifications_muted_until_show_all) Repository.MUTED_UNTIL_FOREVER -> getString(R.string.settings_notifications_muted_until_forever) else -> { @@ -191,8 +190,7 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere } } minPriority?.summaryProvider = Preference.SummaryProvider { pref -> - val minPriorityValue = pref.value.toIntOrNull() ?: 1 // 1/low means all priorities - when (minPriorityValue) { + when (val minPriorityValue = pref.value.toIntOrNull() ?: 1) { // 1/low means all priorities 1 -> getString(R.string.settings_notifications_min_priority_summary_any) 5 -> getString(R.string.settings_notifications_min_priority_summary_max) else -> { @@ -230,8 +228,7 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere } } autoDownload?.summaryProvider = Preference.SummaryProvider { pref -> - val maxSize = pref.value.toLongOrNull() ?: repository.getAutoDownloadMaxSize() - when (maxSize) { + when (val maxSize = pref.value.toLongOrNull() ?: repository.getAutoDownloadMaxSize()) { Repository.AUTO_DOWNLOAD_NEVER -> getString(R.string.settings_notifications_auto_download_summary_never) Repository.AUTO_DOWNLOAD_ALWAYS -> getString(R.string.settings_notifications_auto_download_summary_always) else -> getString(R.string.settings_notifications_auto_download_summary_smaller_than_x, formatBytes(maxSize, decimals = 0)) @@ -263,8 +260,7 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere } } autoDelete?.summaryProvider = Preference.SummaryProvider { pref -> - val seconds = pref.value.toLongOrNull() ?: repository.getAutoDeleteSeconds() - when (seconds) { + when (pref.value.toLongOrNull() ?: repository.getAutoDeleteSeconds()) { Repository.AUTO_DELETE_NEVER -> getString(R.string.settings_notifications_auto_delete_summary_never) Repository.AUTO_DELETE_ONE_DAY_SECONDS -> getString(R.string.settings_notifications_auto_delete_summary_one_day) Repository.AUTO_DELETE_THREE_DAYS_SECONDS -> getString(R.string.settings_notifications_auto_delete_summary_three_days) @@ -395,7 +391,7 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere getString(R.string.settings_advanced_record_logs_summary_disabled) } } - recordLogsEnabled?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, v -> + recordLogsEnabled?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, _ -> lifecycleScope.launch(Dispatchers.IO) { repository.getSubscriptions().forEach { s -> Log.addScrubTerm(shortUrl(s.baseUrl), Log.TermType.Domain) @@ -440,7 +436,7 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere backup?.preferenceDataStore = object : PreferenceDataStore() { } // Dummy store to protect from accidentally overwriting backup?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, v -> backupSelection = v.toString() - val timestamp = SimpleDateFormat("yyMMdd-HHmm").format(Date()); + val timestamp = SimpleDateFormat("yyMMdd-HHmm").format(Date()) val suggestedFilename = when (backupSelection) { BACKUP_EVERYTHING_NO_USERS -> "ntfy-backup-no-users-$timestamp.json" BACKUP_SETTINGS_ONLY -> "ntfy-settings-$timestamp.json" @@ -605,7 +601,6 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere } } catch (e: Exception) { Log.w(TAG, "Error uploading logs", e) - val context = context ?: return@launch requireActivity().runOnUiThread { Toast .makeText(context, getString(R.string.settings_advanced_export_logs_error_uploading, e.message), Toast.LENGTH_LONG) diff --git a/build.gradle b/build.gradle index 02141e5..90f1430 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext.kotlin_version = '1.6.21' repositories { google() - jcenter() + mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:4.1.3' @@ -17,7 +17,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() maven { url "https://jitpack.io" } // For StfalconImageViewer } }