From dcb78aff9e72c59193c7d2599d8dffe0703d8090 Mon Sep 17 00:00:00 2001 From: Chet Henry Date: Sat, 6 Dec 2014 09:27:32 -0700 Subject: [PATCH] Fix but with prefence update and screen. --- .../RideLogger/proguard-android-optimize.txt | 2 +- .../com/ridelogger/CurrentValuesAdapter.java | 20 ++++++++++--------- .../src/com/ridelogger/RideService.java | 3 +++ .../src/com/ridelogger/SettingsActivity.java | 3 +++ 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/contrib/RideLogger/proguard-android-optimize.txt b/contrib/RideLogger/proguard-android-optimize.txt index 9e4b71bb8..987528186 100644 --- a/contrib/RideLogger/proguard-android-optimize.txt +++ b/contrib/RideLogger/proguard-android-optimize.txt @@ -11,7 +11,7 @@ # used if you are only targeting Android 2.0 or later.) Make sure you # test thoroughly if you go this route. -optimizations code/simplification/arithmetic,code/simplification/cast,field/*,class/merging/* --optimizationpasses 6 +-optimizationpasses 24 -allowaccessmodification -dontpreverify diff --git a/contrib/RideLogger/src/com/ridelogger/CurrentValuesAdapter.java b/contrib/RideLogger/src/com/ridelogger/CurrentValuesAdapter.java index 8c79c0783..e603dfbb6 100644 --- a/contrib/RideLogger/src/com/ridelogger/CurrentValuesAdapter.java +++ b/contrib/RideLogger/src/com/ridelogger/CurrentValuesAdapter.java @@ -18,11 +18,12 @@ import android.widget.TextView; public class CurrentValuesAdapter extends BaseAdapter { private StartActivity context; - private int[] keys; - private String[] values = new String[RideService.KEYS.length]; - private String[] keyLabels = new String[RideService.KEYS.length]; - private int size = 20; - private boolean imperial = false; + private int[] keys; + private String[] values = new String[RideService.KEYS.length]; + private String[] keyLabels = new String[RideService.KEYS.length]; + private int size = 20; + private boolean imperial = false; + private SharedPreferences settings = null; private GridView layout; @@ -34,10 +35,11 @@ public class CurrentValuesAdapter extends BaseAdapter { layout.setVerticalSpacing(4); layout.setHorizontalSpacing(4); - SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context); - Set sensors = settings.getStringSet(context.getString(R.string.PREF_TRACKING_SENSORS), null); - size = Integer.valueOf(settings.getString(context.getString(R.string.PREF_TRACKING_SIZE), "20")); - imperial = settings.getBoolean(context.getString(R.string.PREF_TRACKING_IMPERIAL_UNITS), false); + settings = PreferenceManager.getDefaultSharedPreferences(context); + Set sensors = settings.getStringSet(context.getString(R.string.PREF_TRACKING_SENSORS), null); + + size = Integer.valueOf(settings.getString(context.getString(R.string.PREF_TRACKING_SIZE), "20")); + imperial = settings.getBoolean(context.getString(R.string.PREF_TRACKING_IMPERIAL_UNITS), false); if(sensors != null && sensors.size() > 0) { diff --git a/contrib/RideLogger/src/com/ridelogger/RideService.java b/contrib/RideLogger/src/com/ridelogger/RideService.java index 2034ee8b8..cdfae8c03 100644 --- a/contrib/RideLogger/src/com/ridelogger/RideService.java +++ b/contrib/RideLogger/src/com/ridelogger/RideService.java @@ -8,6 +8,7 @@ import java.util.Timer; import java.util.TimerTask; import com.dsi.ant.plugins.antplus.pcc.defines.DeviceType; +import com.dsi.ant.plugins.utility.log.LogAnt; import com.ridelogger.formats.BaseFormat; import com.ridelogger.formats.JsonFormat; import com.ridelogger.listners.Base; @@ -223,6 +224,8 @@ public class RideService extends Service fileFormat.createFile(); fileFormat.writeHeader(); + LogAnt.setDebugLevel(LogAnt.DebugLevel.NONE, this); + final Set pairedAnts = settings.getStringSet(getString(R.string.PREF_PAIRED_ANTS), null); if(pairedAnts != null && !pairedAnts.isEmpty()){ diff --git a/contrib/RideLogger/src/com/ridelogger/SettingsActivity.java b/contrib/RideLogger/src/com/ridelogger/SettingsActivity.java index 42eeb64af..3c2392f1e 100644 --- a/contrib/RideLogger/src/com/ridelogger/SettingsActivity.java +++ b/contrib/RideLogger/src/com/ridelogger/SettingsActivity.java @@ -11,6 +11,7 @@ import com.dsi.ant.plugins.antplus.pcc.defines.DeviceType; import com.dsi.ant.plugins.antplus.pcc.defines.RequestAccessResult; import com.dsi.ant.plugins.antplus.pccbase.MultiDeviceSearch; import com.dsi.ant.plugins.antplus.pccbase.MultiDeviceSearch.MultiDeviceSearchResult; +import com.dsi.ant.plugins.utility.log.LogAnt; import android.app.ActivityManager; import android.app.ActivityManager.RunningServiceInfo; @@ -168,6 +169,8 @@ public class SettingsActivity extends PreferenceActivity { updateList(foundDevices); + LogAnt.setDebugLevel(LogAnt.DebugLevel.NONE, this.getActivity()); + mCallback = new MultiDeviceSearch.SearchCallbacks(){ public void onDeviceFound(final MultiDeviceSearchResult deviceFound) {