From 840a125c8120d66c6a0dd01266545a565ea913a4 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Sat, 27 Aug 2016 22:55:00 +0200 Subject: [PATCH] Fix compilation --- .../freeyourgadget/gadgetbridge/GBApplication.java | 8 ++------ .../gadgetbridge/activities/DebugActivity.java | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java index d4702893d..cd35014f0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java @@ -4,10 +4,8 @@ import android.annotation.TargetApi; import android.app.Application; import android.app.NotificationManager; import android.app.NotificationManager.Policy; -import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.res.Resources; import android.database.Cursor; @@ -43,8 +41,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs; import nodomain.freeyourgadget.gadgetbridge.util.LimitedQueue; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; -//import nodomain.freeyourgadget.gadgetbridge.externalevents.BluetoothConnectReceiver; - /** * Main Application class that initializes and provides access to certain things like * logging and DB access. @@ -309,12 +305,12 @@ public class GBApplication extends Application { * * @return true on successful deletion */ - public static synchronized boolean deleteActivityDatabase() { + public static synchronized boolean deleteActivityDatabase(Context context) { // TODO: flush, close, reopen db if (lockHandler != null) { lockHandler.closeDb(); } - DBHelper dbHelper = new DBHelper(this); + DBHelper dbHelper = new DBHelper(context); boolean result = true; if (dbHelper.existsDB(DBConstants.DATABASE_NAME)) { result = getContext().deleteDatabase(DBConstants.DATABASE_NAME); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java index d55f5a30e..c1ba961d8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java @@ -371,7 +371,7 @@ public class DebugActivity extends GBActivity { .setPositiveButton("Delete", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - if (GBApplication.deleteActivityDatabase()) { + if (GBApplication.deleteActivityDatabase(DebugActivity.this)) { GB.toast(DebugActivity.this, "Activity database successfully deleted.", Toast.LENGTH_SHORT, GB.INFO); } else { GB.toast(DebugActivity.this, "Activity database deletion failed.", Toast.LENGTH_SHORT, GB.INFO);