fix the sitemanager upgrade call

multisite
Floens 8 years ago
parent 9b38f11efe
commit 81ace5c1fa
  1. 4
      Clover/app/src/main/java/org/floens/chan/core/database/DatabaseHelper.java
  2. 19
      Clover/app/src/main/java/org/floens/chan/core/site/SiteManager.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();
}
}

@ -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();

Loading…
Cancel
Save