Move getTraktTools to SgApp.

UweTrottmann · Dec 15, 2016 · cfd52d8 · cfd52d8
1 parent 9d7fd5e
commit cfd52d8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/SgApp.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/SgApp.java
@@ -19,6 +19,7 @@
 import com.battlelancer.seriesguide.util.MovieTools;
 import com.battlelancer.seriesguide.util.ShowTools;
 import com.battlelancer.seriesguide.util.ThemeUtils;
+import com.battlelancer.seriesguide.util.TraktTools;
 import com.crashlytics.android.Crashlytics;
 import com.google.android.gms.analytics.GoogleAnalytics;
 import io.fabric.sdk.android.Fabric;
@@ -67,6 +68,7 @@ public class SgApp extends Application {
     private ServicesComponent servicesComponent;
     private MovieTools movieTools;
     private ShowTools showTools;
+    private TraktTools traktTools;
 
     @Override
     public void onCreate() {
@@ -140,6 +142,13 @@ public synchronized ShowTools getShowTools() {
         return showTools;
     }
 
+    public synchronized TraktTools getTraktTools() {
+        if (traktTools == null) {
+            traktTools = new TraktTools(this);
+        }
+        return traktTools;
+    }
+
     /**
      * Used to enable {@link StrictMode} for debug builds.
      */

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/sync/SgSyncAdapter.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/sync/SgSyncAdapter.java
@@ -465,7 +465,7 @@ private UpdateResult performTraktSync(HashSet<Integer> localShows, long currentT
         }
 
         // get last activity timestamps
-        TraktTools traktTools = TraktTools.getInstance(app);
+        TraktTools traktTools = app.getTraktTools();
         LastActivities lastActivity = traktTools.getLastActivity();
         if (lastActivity == null) {
             // trakt is likely offline or busy, try later
@@ -552,7 +552,7 @@ private UpdateResult performTraktEpisodeSync(@NonNull HashSet<Integer> localShow
         // download watched and collected flags
         // if initial sync, upload any flags missing on trakt
         // otherwise clear all local flags not on trakt
-        int resultCode = TraktTools.getInstance(app).syncEpisodeFlags(localShows, lastActivity,
+        int resultCode = app.getTraktTools().syncEpisodeFlags(localShows, lastActivity,
                 isInitialSync);
 
         if (resultCode < 0) {

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/thetvdbapi/TvdbTools.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/thetvdbapi/TvdbTools.java
@@ -203,7 +203,7 @@ public boolean addShow(int showTvdbId, @Nullable String language,
             app.getShowTools().sendIsAdded(showTvdbId, language);
         } else {
             // ...from trakt
-            TraktTools traktTools = TraktTools.getInstance(app);
+            TraktTools traktTools = app.getTraktTools();
             if (!traktTools.storeEpisodeFlags(traktWatched, showTvdbId,
                     TraktTools.Flag.WATCHED)) {
                 throw new TvdbException("addShow: storing trakt watched episodes failed.");

diff --git a/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktTools.java b/SeriesGuide/src/main/java/com/battlelancer/seriesguide/util/TraktTools.java
@@ -4,7 +4,6 @@
 import android.content.Context;
 import android.content.OperationApplicationException;
 import android.database.Cursor;
-import android.net.Uri;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -59,19 +58,10 @@ public class TraktTools {
     public static final int FAILED = -2;
     public static final int FAILED_CREDENTIALS = -3;
 
-    private static TraktTools traktTools;
-
     private final Context context;
     @Inject Lazy<Sync> traktSync;
 
-    public static synchronized TraktTools getInstance(SgApp app) {
-        if (traktTools == null) {
-            traktTools = new TraktTools(app);
-        }
-        return traktTools;
-    }
-
-    private TraktTools(SgApp app) {
+    public TraktTools(SgApp app) {
         context = app.getApplicationContext();
         app.getServicesComponent().inject(this);
     }