Kotlin: convert TaskManager

UweTrottmann · Oct 17, 2024 · 715c7d9 · 715c7d9
1 parent 07c8004
commit 715c7d9
Show file tree

Hide file tree

Showing 20 changed files with 104 additions and 102 deletions.
diff --git a/app/src/main/java/com/battlelancer/seriesguide/dataliberation/AutoBackupFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/dataliberation/AutoBackupFragment.kt
@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
 // SPDX-License-Identifier: Apache-2.0
+// Copyright 2013-2024 Uwe Trottmann
 
 package com.battlelancer.seriesguide.dataliberation
 
@@ -63,7 +63,7 @@ class AutoBackupFragment : Fragment() {
         }
 
         binding.buttonAutoBackupNow.setOnClickListener {
-            if (TaskManager.getInstance().tryBackupTask(requireContext())) {
+            if (TaskManager.tryBackupTask(requireContext())) {
                 setProgressLock(true)
             }
         }

diff --git a/app/src/main/java/com/battlelancer/seriesguide/dataliberation/JsonExportTask.kt b/app/src/main/java/com/battlelancer/seriesguide/dataliberation/JsonExportTask.kt
@@ -174,7 +174,7 @@ class JsonExportTask(
     }
 
     private fun onPostExecute(result: Int) {
-        TaskManager.getInstance().releaseBackupTaskRef()
+        TaskManager.releaseBackupTaskRef()
 
         if (!isAutoBackupMode) {
             val messageId: Int

diff --git a/app/src/main/java/com/battlelancer/seriesguide/dataliberation/JsonImportTask.kt b/app/src/main/java/com/battlelancer/seriesguide/dataliberation/JsonImportTask.kt
@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
 // SPDX-License-Identifier: Apache-2.0
+// Copyright 2013-2024 Uwe Trottmann
 
 package com.battlelancer.seriesguide.dataliberation
 
@@ -120,8 +120,7 @@ class JsonImportTask(
 
     private fun doInBackground(coroutineScope: CoroutineScope): Int {
         // Ensure no large database ops are running
-        val tm = TaskManager.getInstance()
-        if (SgSyncAdapter.isSyncActive(context, false) || tm.isAddTaskRunning) {
+        if (SgSyncAdapter.isSyncActive(context, false) || TaskManager.isAddTaskRunning) {
             return ERROR_LARGE_DB_OP
         }
 

diff --git a/app/src/main/java/com/battlelancer/seriesguide/history/HistoryActivity.kt b/app/src/main/java/com/battlelancer/seriesguide/history/HistoryActivity.kt
@@ -64,7 +64,7 @@ class HistoryActivity : BaseActivity(), OnAddShowListener {
      * Called if the user adds a show from a trakt stream fragment.
      */
     override fun onAddShow(show: SearchResult) {
-        TaskManager.getInstance().performAddTask(this, show)
+        TaskManager.performAddTask(this, show)
     }
 
     companion object {

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/FirstRunView.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/FirstRunView.kt
@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
 // SPDX-License-Identifier: Apache-2.0
+// Copyright 2018-2024 Uwe Trottmann
 
 package com.battlelancer.seriesguide.shows
 
@@ -63,7 +63,7 @@ class FirstRunView @JvmOverloads constructor(context: Context, attrs: AttributeS
                 putBoolean(DisplaySettings.KEY_PREVENT_SPOILERS, noSpoilers)
             }
             // update next episode strings right away
-            TaskManager.getInstance().tryNextEpisodeUpdateTask(v.context)
+            TaskManager.tryNextEpisodeUpdateTask(v.context)
             // show
             binding.checkboxNoSpoilers.isChecked = noSpoilers
         }

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsActivityImpl.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsActivityImpl.kt
@@ -312,7 +312,7 @@ open class ShowsActivityImpl : BaseTopActivity(), AddShowDialogFragment.OnAddSho
         }
 
         // update next episodes
-        TaskManager.getInstance().tryNextEpisodeUpdateTask(this)
+        TaskManager.tryNextEpisodeUpdateTask(this)
     }
 
     override fun onPause() {
@@ -336,7 +336,7 @@ open class ShowsActivityImpl : BaseTopActivity(), AddShowDialogFragment.OnAddSho
      * Called if the user adds a show from a trakt stream fragment.
      */
     override fun onAddShow(show: SearchResult) {
-        TaskManager.getInstance().performAddTask(this, show)
+        TaskManager.performAddTask(this, show)
     }
 
     override val snackbarParentView: View

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsDistillationFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/ShowsDistillationFragment.kt
@@ -147,7 +147,7 @@ class ShowsDistillationFragment : AppCompatDialogFragment() {
 
         override fun onNoReleasedChanged(value: Boolean) {
             DisplaySettings.setNoReleasedEpisodes(requireContext(), value)
-            TaskManager.getInstance().tryNextEpisodeUpdateTask(requireContext())
+            TaskManager.tryNextEpisodeUpdateTask(requireContext())
         }
 
     }

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/search/SearchActivityImpl.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/search/SearchActivityImpl.kt
@@ -194,7 +194,7 @@ open class SearchActivityImpl : BaseMessageActivity(), AddShowDialogFragment.OnA
     }
 
     override fun onAddShow(show: SearchResult) {
-        TaskManager.getInstance().performAddTask(this, show)
+        TaskManager.performAddTask(this, show)
     }
 
 

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/AddShowPopupMenu.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/AddShowPopupMenu.kt
@@ -39,7 +39,7 @@ class AddShowPopupMenu(
             R.id.menu_action_add_show_add -> {
                 // post so other fragments can display a progress indicator for that show
                 EventBus.getDefault().post(OnAddingShowEvent(show.tmdbId))
-                TaskManager.getInstance().performAddTask(context, show)
+                TaskManager.performAddTask(context, show)
                 true
             }
 

diff --git a/.../main/java/com/battlelancer/seriesguide/shows/search/discover/ItemAddShowClickListener.kt b/.../main/java/com/battlelancer/seriesguide/shows/search/discover/ItemAddShowClickListener.kt
@@ -45,7 +45,7 @@ open class ItemAddShowClickListener(
 
     override fun onAddClick(item: SearchResult) {
         EventBus.getDefault().post(OnAddingShowEvent(item.tmdbId))
-        TaskManager.getInstance().performAddTask(context, item)
+        TaskManager.performAddTask(context, item)
     }
 
     override fun onMoreOptionsClick(view: View, show: SearchResult) {

diff --git a/...in/java/com/battlelancer/seriesguide/shows/search/discover/ShowsDiscoverPagingActivity.kt b/...in/java/com/battlelancer/seriesguide/shows/search/discover/ShowsDiscoverPagingActivity.kt
@@ -74,7 +74,7 @@ class ShowsDiscoverPagingActivity : BaseMessageActivity(), AddShowDialogFragment
     }
 
     override fun onAddShow(show: SearchResult) {
-        TaskManager.getInstance().performAddTask(this, show)
+        TaskManager.performAddTask(this, show)
     }
 
     companion object {

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/ShowsTraktActivity.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/ShowsTraktActivity.kt
@@ -62,7 +62,7 @@ class ShowsTraktActivity : BaseMessageActivity(), AddShowDialogFragment.OnAddSho
     }
 
     override fun onAddShow(show: SearchResult) {
-        TaskManager.getInstance().performAddTask(this, show)
+        TaskManager.performAddTask(this, show)
     }
 
     companion object {

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/TraktAddFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/TraktAddFragment.kt
@@ -178,8 +178,10 @@ class TraktAddFragment : Fragment() {
                         }
                     }
                     EventBus.getDefault().post(OnAddingShowEvent())
-                    TaskManager.getInstance()
-                        .performAddTask(context, showsToAdd, false, false)
+                    TaskManager.performAddTask(requireContext(), showsToAdd,
+                        isSilentMode = false,
+                        isMergingShows = false
+                    )
                 }
                 // disable the item so the user has to come back
                 menuItem.isEnabled = false

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/search/similar/SimilarShowsActivity.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/search/similar/SimilarShowsActivity.kt
@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
 // SPDX-License-Identifier: Apache-2.0
+// Copyright 2019-2024 Uwe Trottmann
 
 package com.battlelancer.seriesguide.shows.search.similar
 
@@ -30,7 +30,7 @@ class SimilarShowsActivity : BaseSimilarActivity(), AddShowDialogFragment.OnAddS
     }
 
     override fun onAddShow(show: SearchResult) {
-        TaskManager.getInstance().performAddTask(this, show)
+        TaskManager.performAddTask(this, show)
     }
 
     companion object {

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/tools/AddShowTask.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/tools/AddShowTask.kt
@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
 // SPDX-License-Identifier: Apache-2.0
+// Copyright 2011-2024 Uwe Trottmann
 
 package com.battlelancer.seriesguide.shows.tools
 
@@ -321,7 +321,7 @@ class AddShowTask(
 
     @Deprecated("Deprecated in Java")
     override fun onPostExecute(aVoid: Void?) {
-        TaskManager.getInstance().releaseAddTaskRef()
+        TaskManager.releaseAddTaskRef()
     }
 
     private fun publishProgress(result: Int) {

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/tools/LatestEpisodeUpdateTask.java b/app/src/main/java/com/battlelancer/seriesguide/shows/tools/LatestEpisodeUpdateTask.java
@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
 // SPDX-License-Identifier: Apache-2.0
+// Copyright 2014-2024 Uwe Trottmann
 
 package com.battlelancer.seriesguide.shows.tools;
 
@@ -32,7 +32,7 @@ protected Void doInBackground(Integer... params) {
 
     @Override
     protected void onPostExecute(Void aVoid) {
-        TaskManager.getInstance().releaseNextEpisodeUpdateTaskRef();
+        TaskManager.releaseNextEpisodeUpdateTaskRef();
     }
 
     public static void updateLatestEpisodeFor(Context context, Long showId) {

diff --git a/app/src/main/java/com/battlelancer/seriesguide/sync/HexagonSync.java b/app/src/main/java/com/battlelancer/seriesguide/sync/HexagonSync.java
@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
 // SPDX-License-Identifier: Apache-2.0
+// Copyright 2017-2024 Uwe Trottmann
 
 package com.battlelancer.seriesguide.sync;
 
@@ -156,7 +156,7 @@ private HexagonResult syncShows(Map<Integer, Long> tmdbIdsToShowIds) {
         boolean addNewShows = !newShows.isEmpty();
         if (addNewShows) {
             List<SearchResult> newShowsList = new LinkedList<>(newShows.values());
-            TaskManager.getInstance().performAddTask(context, newShowsList, true, !hasMergedShows);
+            TaskManager.performAddTask(context, newShowsList, true, !hasMergedShows);
         } else if (!hasMergedShows) {
             // set shows as merged
             HexagonSettings.setHasMergedShows(context, true);

diff --git a/app/src/main/java/com/battlelancer/seriesguide/sync/SgSyncAdapter.kt b/app/src/main/java/com/battlelancer/seriesguide/sync/SgSyncAdapter.kt
@@ -204,7 +204,7 @@ class SgSyncAdapter(context: Context) : AbstractThreadedSyncAdapter(context, tru
                 if (Thread.interrupted()) throw InterruptedException()
 
                 // update next episodes for all shows
-                TaskManager.getInstance().tryNextEpisodeUpdateTask(context)
+                TaskManager.tryNextEpisodeUpdateTask(context)
 
                 updateTimeAndFailedCounter(prefs, resultCode)
             }

diff --git a/app/src/main/java/com/battlelancer/seriesguide/ui/BaseActivity.kt b/app/src/main/java/com/battlelancer/seriesguide/ui/BaseActivity.kt
@@ -1,5 +1,5 @@
-// Copyright 2023 Uwe Trottmann
 // SPDX-License-Identifier: Apache-2.0
+// Copyright 2011-2024 Uwe Trottmann
 
 package com.battlelancer.seriesguide.ui
 
@@ -93,7 +93,7 @@ abstract class BaseActivity : BaseThemeActivity() {
         if (!BackupSettings.isTimeForAutoBackup(this)) {
             return false
         }
-        TaskManager.getInstance().tryBackupTask(this)
+        TaskManager.tryBackupTask(this)
         return true
     }