From 81ace5c1fa24f0bb4f5e753350a94b56c9ebe1ec Mon Sep 17 00:00:00 2001
From: Floens <floens@gmail.com>
Date: Sat, 30 Dec 2017 20:28:46 +0100
Subject: [PATCH] fix the sitemanager upgrade call

---
 .../chan/core/database/DatabaseHelper.java    |  4 +---
 .../floens/chan/core/site/SiteManager.java    | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Clover/app/src/main/java/org/floens/chan/core/database/DatabaseHelper.java b/Clover/app/src/main/java/org/floens/chan/core/database/DatabaseHelper.java
index 1e1c99b6..c63bf34e 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/database/DatabaseHelper.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/database/DatabaseHelper.java
@@ -41,8 +41,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.floens.chan.Chan.getGraph;
-
 public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     private static final String TAG = "DatabaseHelper";
 
@@ -230,7 +228,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 Logger.e(TAG, "Error upgrading to version 22", e);
             }
 
-            getGraph().get(SiteManager.class).addSiteForLegacy();
+            SiteManager.addSiteForLegacy();
         }
     }
 
diff --git a/Clover/app/src/main/java/org/floens/chan/core/site/SiteManager.java b/Clover/app/src/main/java/org/floens/chan/core/site/SiteManager.java
index 245c61bc..a0f70bc7 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/site/SiteManager.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/site/SiteManager.java
@@ -33,11 +33,19 @@ import javax.inject.Singleton;
 
 @Singleton
 public class SiteManager {
+    private static boolean addSiteForLegacy = false;
+
+    /**
+     * Called from the DatabaseHelper when upgrading to the tables with a site id.
+     */
+    public static void addSiteForLegacy() {
+        addSiteForLegacy = true;
+    }
+
     private SiteRepository siteRepository;
     private SiteResolver resolver;
 
     private boolean initialized = false;
-    private boolean addSiteForLegacy = false;
 
     @Inject
     public SiteManager(SiteRepository siteRepository,
@@ -78,19 +86,14 @@ public class SiteManager {
         callback.onSiteAdded(site);
     }
 
-    /**
-     * Called from the DatabaseHelper when upgrading to the tables with a site id.
-     */
-    public void addSiteForLegacy() {
-        addSiteForLegacy = true;
-    }
-
     public void initialize() {
         if (initialized) {
             throw new IllegalStateException("Already initialized");
         }
 
         if (addSiteForLegacy) {
+            addSiteForLegacy = false;
+
             Site site = new Chan4();
 
             SiteConfig config = new SiteConfig();