mirrors
/
Gadgetbridge
mirror of https://github.com/nico202/Gadgetbridge.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix compilation

master
cpfeiffer 2016-08-27 22:55:00 +02:00
parent 8d6e6c8675
commit 840a125c81
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
View File

@ -4,10 +4,8 @@ import android.annotation.TargetApi;
import android.app.Application; import android.app.Application;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.NotificationManager.Policy; import android.app.NotificationManager.Policy;
import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Resources; import android.content.res.Resources;
import android.database.Cursor; 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.LimitedQueue;
import nodomain.freeyourgadget.gadgetbridge.util.Prefs; import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
//import nodomain.freeyourgadget.gadgetbridge.externalevents.BluetoothConnectReceiver;
/** /**
* Main Application class that initializes and provides access to certain things like * Main Application class that initializes and provides access to certain things like
* logging and DB access. * logging and DB access.
@ -309,12 +305,12 @@ public class GBApplication extends Application {
* *
* @return true on successful deletion * @return true on successful deletion
*/ */
public static synchronized boolean deleteActivityDatabase() { public static synchronized boolean deleteActivityDatabase(Context context) {
// TODO: flush, close, reopen db // TODO: flush, close, reopen db
if (lockHandler != null) { if (lockHandler != null) {
lockHandler.closeDb(); lockHandler.closeDb();
} }
DBHelper dbHelper = new DBHelper(this); DBHelper dbHelper = new DBHelper(context);
boolean result = true; boolean result = true;
if (dbHelper.existsDB(DBConstants.DATABASE_NAME)) { if (dbHelper.existsDB(DBConstants.DATABASE_NAME)) {
result = getContext().deleteDatabase(DBConstants.DATABASE_NAME); result = getContext().deleteDatabase(DBConstants.DATABASE_NAME);

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
View File

@ -371,7 +371,7 @@ public class DebugActivity extends GBActivity {
.setPositiveButton("Delete", new DialogInterface.OnClickListener() { .setPositiveButton("Delete", new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { 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); GB.toast(DebugActivity.this, "Activity database successfully deleted.", Toast.LENGTH_SHORT, GB.INFO);
} else { } else {
GB.toast(DebugActivity.this, "Activity database deletion failed.", Toast.LENGTH_SHORT, GB.INFO); GB.toast(DebugActivity.this, "Activity database deletion failed.", Toast.LENGTH_SHORT, GB.INFO);