From 0c5e33e40538011cacbcf97bd93bd42443da964c Mon Sep 17 00:00:00 2001 From: Quentin Hibon Date: Tue, 8 Aug 2023 22:12:38 +0200 Subject: [PATCH] Add @Deprecated when overriding @Deprecated methods --- .../uhabits/activities/habits/list/ListHabitsActivity.kt | 1 + .../isoron/uhabits/activities/settings/SettingsFragment.kt | 2 ++ .../main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.kt | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt index b7ca3235f..918e28180 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt @@ -127,6 +127,7 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener { return menu.onItemSelected(item) } + @Deprecated("Deprecated in Java") override fun onActivityResult(request: Int, result: Int, data: Intent?) { super.onActivityResult(request, result, data) screen.onResult(request, result, data) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt index e67f6a567..0fc1f43c8 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt @@ -53,6 +53,8 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis private var ringtoneManager: RingtoneManager? = null private lateinit var prefs: Preferences private var widgetUpdater: WidgetUpdater? = null + + @Deprecated("Deprecated in Java") override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { if (requestCode == RINGTONE_REQUEST_CODE) { ringtoneManager!!.update(data) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.kt b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.kt index aa96604c2..70abc8f7f 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.kt @@ -60,12 +60,14 @@ class AndroidTaskRunner : TaskRunner { publishProgress(progress) } + @Deprecated("Deprecated in Java") override fun doInBackground(vararg params: Void?): Void? { if (isCancelled) return null task.doInBackground() return null } + @Deprecated("Deprecated in Java") override fun onPostExecute(aVoid: Void?) { if (isCancelled) return task.onPostExecute() @@ -74,6 +76,7 @@ class AndroidTaskRunner : TaskRunner { for (l in listeners) l.onTaskFinished(task) } + @Deprecated("Deprecated in Java") override fun onPreExecute() { if (isCancelled) return for (l in listeners) l.onTaskStarted(task) @@ -82,6 +85,7 @@ class AndroidTaskRunner : TaskRunner { task.onPreExecute() } + @Deprecated("Deprecated in Java") override fun onProgressUpdate(vararg values: Int?) { values[0]?.let { task.onProgressUpdate(it) } }