From 8969166150ebd1d2ca8587e76a49418beef6334e Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Sat, 14 Apr 2018 22:53:21 +0200 Subject: [PATCH] Minor cleanup --- .../java/com/health/openscale/gui/ScreenshotRecorder.java | 4 +--- .../src/main/java/com/health/openscale/core/OpenScale.java | 4 +++- .../openscale/core/bluetooth/BluetoothBeurerSanitas.java | 2 +- .../health/openscale/gui/preferences/BackupPreferences.java | 4 ++-- .../java/com/health/openscale/gui/views/MeasurementView.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java b/android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java index 07717f7a..88dda8ab 100644 --- a/android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java +++ b/android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java @@ -17,8 +17,6 @@ package com.health.openscale.gui; import android.content.Context; import android.content.SharedPreferences; -import android.content.res.Configuration; -import android.content.res.Resources; import android.graphics.Bitmap; import android.preference.PreferenceManager; import android.support.test.InstrumentationRegistry; @@ -99,7 +97,7 @@ public class ScreenshotRecorder { }); } catch (Throwable throwable) { throwable.printStackTrace(); - }; + } SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); diff --git a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java index 9ba781a0..763d9c00 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java +++ b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java @@ -69,6 +69,8 @@ import java.util.TreeMap; public class OpenScale { + public static final String DATABASE_NAME = "openScale.db"; + private static OpenScale instance; private AppDatabase appDB; @@ -110,7 +112,7 @@ public class OpenScale { appDB.close(); } - appDB = Room.databaseBuilder(context, AppDatabase.class, "openScale.db") + appDB = Room.databaseBuilder(context, AppDatabase.class, DATABASE_NAME) .allowMainThreadQueries() .addCallback(new RoomDatabase.Callback() { @Override diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerSanitas.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerSanitas.java index 511ea3f5..578163cf 100644 --- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerSanitas.java +++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerSanitas.java @@ -42,7 +42,7 @@ import java.util.UUID; public class BluetoothBeurerSanitas extends BluetoothCommunication { public final static String TAG = "BeurerSanitas"; - enum DeviceType { BEURER_BF700_800_RT_LIBRA, BEURER_BF710, SANITAS_SBF70_70 }; + enum DeviceType { BEURER_BF700_800_RT_LIBRA, BEURER_BF710, SANITAS_SBF70_70 } private static final int PRIMARY_SERVICE = 0x180A; private static final UUID SYSTEM_ID = UUID.fromString("00002A23-0000-1000-8000-00805F9B34FB"); diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/BackupPreferences.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/BackupPreferences.java index fca37278..8f8496aa 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/preferences/BackupPreferences.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/preferences/BackupPreferences.java @@ -221,14 +221,14 @@ public class BackupPreferences extends PreferenceFragment { if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { importBackup(); } else { - Toast.makeText(getActivity().getApplicationContext(), getResources().getString(R.string.permission_not_granted), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), R.string.permission_not_granted, Toast.LENGTH_SHORT).show(); } break; case PermissionHelper.PERMISSIONS_REQUEST_ACCESS_WRITE_STORAGE: if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { exportBackup(); } else { - Toast.makeText(getActivity().getApplicationContext(), getResources().getString(R.string.permission_not_granted), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), R.string.permission_not_granted, Toast.LENGTH_SHORT).show(); } break; } diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java index 1103240b..02d6769e 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java @@ -386,7 +386,7 @@ public abstract class MeasurementView extends TableLayout { public String getPreferenceSummary() { return ""; } public boolean hasExtraPreferences() { return false; } - public void prepareExtraPreferencesScreen(PreferenceScreen screen) { }; + public void prepareExtraPreferencesScreen(PreferenceScreen screen) { } protected abstract View getInputView(); protected abstract boolean validateAndSetInput(View view);