isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use application context to initialize ActiveAndroid

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-03-25 07:09:41 -04:00
parent 28dad560a6
commit 59c0af17d7
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/isoron/uhabits/HabitsApplication.java
View File

@@ -66,7 +66,7 @@ public class HabitsApplication extends Application
if(db.exists()) db.delete(); if(db.exists()) db.delete();
} }
DatabaseHelper.initializeActiveAndroid(this); DatabaseHelper.initializeActiveAndroid();
} }
@Override @Override

5
app/src/main/java/org/isoron/uhabits/helpers/DatabaseHelper.java
View File

@@ -149,8 +149,11 @@ public class DatabaseHelper
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static void initializeActiveAndroid(Context context) public static void initializeActiveAndroid()
{ {
Context context = HabitsApplication.getContext();
if(context == null) throw new RuntimeException("application context should not be null");
Configuration dbConfig = new Configuration.Builder(context) Configuration dbConfig = new Configuration.Builder(context)
.setDatabaseName(getDatabaseFilename()) .setDatabaseName(getDatabaseFilename())
.setDatabaseVersion(BuildConfig.databaseVersion) .setDatabaseVersion(BuildConfig.databaseVersion)

8
app/src/main/java/org/isoron/uhabits/io/LoopDBImporter.java
View File

@@ -19,15 +19,12 @@
package org.isoron.uhabits.io; package org.isoron.uhabits.io;
import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import com.activeandroid.ActiveAndroid; import com.activeandroid.ActiveAndroid;
import org.isoron.uhabits.BuildConfig;
import org.isoron.uhabits.HabitsApplication;
import org.isoron.uhabits.helpers.DatabaseHelper; import org.isoron.uhabits.helpers.DatabaseHelper;
import java.io.File; import java.io.File;
@@ -57,12 +54,11 @@ public class LoopDBImporter extends AbstractImporter
public void importHabitsFromFile(@NonNull File file) throws IOException public void importHabitsFromFile(@NonNull File file) throws IOException
{ {
ActiveAndroid.dispose(); ActiveAndroid.dispose();
Context context = HabitsApplication.getContext();
File originalDB = DatabaseHelper.getDatabaseFile(); File originalDB = DatabaseHelper.getDatabaseFile();
File backupDir = DatabaseHelper.getFilesDir(context, "Backups"); File backupDir = DatabaseHelper.getFilesDir("Backups");
DatabaseHelper.saveDatabaseCopy(backupDir); DatabaseHelper.saveDatabaseCopy(backupDir);
DatabaseHelper.copy(file, originalDB); DatabaseHelper.copy(file, originalDB);
DatabaseHelper.initializeActiveAndroid(context); DatabaseHelper.initializeActiveAndroid();
} }
} }