From b345cce09e2b179d97f71fa08b4f11591e5e564e Mon Sep 17 00:00:00 2001 From: Negue Date: Thu, 1 Oct 2015 21:18:31 +0200 Subject: [PATCH] Open/save database from "external" directory / update changelog --- Habitica/Habitica.iml | 6 ++--- Habitica/assets/paperboy/changelog.json | 4 +++ .../android/habitica/HabiticaApplication.java | 26 +++++++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/Habitica/Habitica.iml b/Habitica/Habitica.iml index a200f8d59..18844ac30 100644 --- a/Habitica/Habitica.iml +++ b/Habitica/Habitica.iml @@ -125,8 +125,8 @@ - + @@ -140,8 +140,8 @@ - + @@ -153,8 +153,8 @@ - + diff --git a/Habitica/assets/paperboy/changelog.json b/Habitica/assets/paperboy/changelog.json index 28ab5f300..ad1998a28 100644 --- a/Habitica/assets/paperboy/changelog.json +++ b/Habitica/assets/paperboy/changelog.json @@ -10,6 +10,10 @@ "type": "B", "title": "Avatar-Drawing: Position without a mount/met" }, + { + "type": "B", + "title": "Fixed #4, #5" + }, { "type": "N", "title": "Generated avatar images are now cached" diff --git a/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java b/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java index 9370f1f91..622728722 100644 --- a/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java +++ b/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java @@ -1,10 +1,14 @@ package com.habitrpg.android.habitica; import android.app.Application; +import android.database.DatabaseErrorHandler; +import android.database.sqlite.SQLiteDatabase; import com.instabug.library.Instabug; import com.raizlabs.android.dbflow.config.FlowManager; +import java.io.File; + /** * Created by Negue on 14.06.2015. */ @@ -19,4 +23,26 @@ public class HabiticaApplication extends Application { Instabug.DEBUG = BuildConfig.DEBUG; Instabug.initialize(this, "a5aa5f471a9cd8a958c0c55181172655"); } + + @Override + public SQLiteDatabase openOrCreateDatabase(String name, + int mode, SQLiteDatabase.CursorFactory factory) { + return super.openOrCreateDatabase(getDatabasePath(name).getAbsolutePath(), mode, factory); + } + + @Override + public SQLiteDatabase openOrCreateDatabase(String name, + int mode, SQLiteDatabase.CursorFactory factory, DatabaseErrorHandler errorHandler) { + return super.openOrCreateDatabase(getDatabasePath(name).getAbsolutePath(), mode, factory, errorHandler); + } + + @Override + public boolean deleteDatabase(String name) { + return super.deleteDatabase(getDatabasePath(name).getAbsolutePath()); + } + + @Override + public File getDatabasePath(String name) { + return new File(getExternalFilesDir(null), "HabiticaDatabase/"+name); + } }