diff --git a/.gitignore b/.gitignore
index a392be5b6..c5663deaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ local.properties
 .gradle/
 .idea/
 build/
+gen/
 
 # Intellij files (Android Studio)
 *.iml
diff --git a/.travis.yml b/.travis.yml
index 15b8ddd39..6e1b4b709 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,8 +20,8 @@ android:
     components:
         - tools #latest for "builtin" sdk tools (24.4.1 in Android-25)
         #To update SDK Tools to latest, another update is required
-        #- tools #latest, 25.2.4 as of 2016-12-16
-        - platform-tools #latest, 25.0.3 as of 2016-12-17
+        #- tools #latest, 26.0.2 as of 2017-07-30
+        - platform-tools #latest, 26.0.0 as of 2017-07-30
         - build-tools-26.0.1
         - android-25
         - extra-android-m2repository
diff --git a/Project_Default.xml b/Project_Default.xml
index 35a507dcd..a5dfdd484 100644
--- a/Project_Default.xml
+++ b/Project_Default.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--suppress XmlUnboundNsPrefix -->
 <inspections version="1.0">
   <option name="myName" value="Project Default" />
   <option name="myLocal" value="true" />
   <inspection_tool class="AndroidLintExtraTranslation" enabled="false" level="ERROR" enabled_by_default="false" />
-  <inspection_tool class="AndroidLintImpliedQuantity" enabled="false" level="ERROR" enabled_by_default="false" />
-  <inspection_tool class="AndroidLintMissingQuantity" enabled="false" level="ERROR" enabled_by_default="false" />
   <inspection_tool class="AndroidLintMissingTranslation" enabled="false" level="ERROR" enabled_by_default="false" />
   <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
     <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 9ab918981..5d9959692 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -41,7 +41,11 @@
 	    android:icon="@drawable/ic_launcher"
 	    android:label="@string/app_name"
 		android:extractNativeLibs="false"
-		android:theme="@style/AppTheme">
+		android:supportsRtl="true"
+		android:allowBackup="true"
+		android:theme="@style/AppTheme"
+		android:fullBackupContent="@xml/backup_descriptor"
+		tools:ignore="UnusedAttribute">
 
 		<activity
 			android:name=".view.MainLayout"
@@ -60,7 +64,18 @@
 				<data android:host="*" />
 				<data android:pathPattern="runnerup.db.export" />
 			</intent-filter>
-  		</activity>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<!--FirebaseAppIndexing-->
+				<data
+					android:host="github.com"
+					android:pathPrefix="/jonasoreland/runnerup"
+					android:scheme="http" />
+			</intent-filter>
+		</activity>
 
 		<activity android:name=".view.StartActivity"/>
 
@@ -89,14 +104,14 @@
 		<activity android:name=".view.UploadActivity"/>
 
 		<activity android:name=".view.ManageWorkoutsActivity">
-			<intent-filter>
+			<intent-filter tools:ignore="GoogleAppIndexingWarning,AppLinkUrlError">
 				<action android:name="android.intent.action.VIEW" />
   				<action android:name="android.intent.action.EDIT" />
   				<category android:name="android.intent.category.DEFAULT" />
   				<data android:mimeType="application/vnd.garmin.workout+json"/>
 			</intent-filter>
 <!-- Check for application/json too, see http://code.google.com/p/android/issues/detail?id=48594 -->
-			<intent-filter>
+			<intent-filter tools:ignore="GoogleAppIndexingWarning,AppLinkUrlError">
 				<action android:name="android.intent.action.VIEW" />
   				<action android:name="android.intent.action.EDIT" />
   				<category android:name="android.intent.category.DEFAULT" />
diff --git a/app/assets/bundled/shared_prefs/100m_audio_cues.xml b/app/assets/bundled/shared_prefs/100m_audio_cues.xml
index 246e7c07c..31484f105 100644
--- a/app/assets/bundled/shared_prefs/100m_audio_cues.xml
+++ b/app/assets/bundled/shared_prefs/100m_audio_cues.xml
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<!--suppress XmlUnboundNsPrefix -->
 <map>
 <boolean name="cueinfo_target_coaching" value="false" />
 <boolean name="cueinfo_total_time" value="false" />
diff --git a/app/build.gradle b/app/build.gradle
index d2e436f43..60237576f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -98,13 +98,9 @@ android {
         checkReleaseBuilds true
         //promote to error, must be handled
         fatal 'InlinedApi', 'InconsistentArrays'
-        //TODO: See GradleCompatible comments, check manually with ./gradlew app:dependencies
+        //Remove with AS3: https://issuetracker.google.com/issues/37131435
         warning 'GradleCompatible'
-        //Support lib > 25.0.1 _sometimes_ raises this issue. Should be fixed though
-        warning 'RestrictedApi'
         // Ignore some specific checks completely
-        ignore 'MissingTranslation'
-
         //All translations will not be complete
         ignore 'MissingTranslation'
         //icon with all densities are not included - don't bother
@@ -136,10 +132,9 @@ dependencies {
     compile project(':hrdevice')
     latestWearApp project(':wear')
 
-    //Lint bug: https://code.google.com/p/android/issues/detail?id=231323
     latestCompile "com.android.support:design:${rootProject.ext.supportLibrary}"
 
-    //Lint bug: https://code.google.com/p/android/issues/detail?id=231321
+    //Lint bug: https://issuetracker.google.com/issues/37131433
     //noinspection GradleDependency
     froyoCompile 'com.android.support:design:24.1.0' //SDK <10 dropped in 24.2
 
diff --git a/app/froyo/AndroidManifest.xml b/app/froyo/AndroidManifest.xml
index 90d0ff279..56bc75cba 100644
--- a/app/froyo/AndroidManifest.xml
+++ b/app/froyo/AndroidManifest.xml
@@ -22,7 +22,8 @@
         tools:overrideLibrary="com.mapbox.mapboxsdk, com.jjoe64.graphview"/>
 
     <application
-        android:label="@string/app_name">
+        android:label="@string/app_name"
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
     </application>
 
 </manifest> 
diff --git a/app/froyo/java/org/runnerup/tracker/component/TrackerPebble.java b/app/froyo/java/org/runnerup/tracker/component/TrackerPebble.java
index b2f06d6ba..d17db50ad 100644
--- a/app/froyo/java/org/runnerup/tracker/component/TrackerPebble.java
+++ b/app/froyo/java/org/runnerup/tracker/component/TrackerPebble.java
@@ -8,7 +8,7 @@
 import org.runnerup.tracker.WorkoutObserver;
 import org.runnerup.workout.WorkoutInfo;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class TrackerPebble extends DefaultTrackerComponent implements WorkoutObserver {
 
     public static final String NAME = "PEBBLE";
diff --git a/app/froyo/java/org/runnerup/tracker/component/TrackerWear.java b/app/froyo/java/org/runnerup/tracker/component/TrackerWear.java
index b9e6feddd..57b50dca8 100644
--- a/app/froyo/java/org/runnerup/tracker/component/TrackerWear.java
+++ b/app/froyo/java/org/runnerup/tracker/component/TrackerWear.java
@@ -24,7 +24,7 @@
 import org.runnerup.tracker.WorkoutObserver;
 import org.runnerup.workout.WorkoutInfo;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class TrackerWear extends DefaultTrackerComponent implements WorkoutObserver {
 
     public static final String NAME = "WEAR";
diff --git a/app/froyo/java/org/runnerup/util/MapWrapper.java b/app/froyo/java/org/runnerup/util/MapWrapper.java
index 18735d563..cbfbc0a4e 100644
--- a/app/froyo/java/org/runnerup/util/MapWrapper.java
+++ b/app/froyo/java/org/runnerup/util/MapWrapper.java
@@ -40,7 +40,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class MapWrapper implements Constants {
 
     public MapWrapper(Context context, SQLiteDatabase mDB, long mID, Formatter formatter, MapView mapView) {
diff --git a/app/froyo/java/org/runnerup/widget/AboutPreference.java b/app/froyo/java/org/runnerup/widget/AboutPreference.java
index 5c3259dad..6a2bc23e7 100644
--- a/app/froyo/java/org/runnerup/widget/AboutPreference.java
+++ b/app/froyo/java/org/runnerup/widget/AboutPreference.java
@@ -26,7 +26,7 @@
 import android.preference.DialogPreference;
 import android.util.AttributeSet;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class AboutPreference extends DialogPreference {
 
     public AboutPreference(Context context, AttributeSet attrs) {
diff --git a/app/latest/AndroidManifest.xml b/app/latest/AndroidManifest.xml
index 9c86d4890..d876b3814 100644
--- a/app/latest/AndroidManifest.xml
+++ b/app/latest/AndroidManifest.xml
@@ -16,10 +16,13 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="org.runnerup">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.runnerup">
+
 
 	<application
-	    android:label="@string/app_name">
+        android:label="@string/app_name"
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
 		<meta-data android:name="com.google.android.gms.version"
            android:value="@integer/google_play_services_version" />
         <receiver android:name=".feedwidget.FeedWidgetProvider" >
diff --git a/app/latest/java/org/matthiaszimmermann/location/egm96/Geoid.java b/app/latest/java/org/matthiaszimmermann/location/egm96/Geoid.java
index eeca34702..59cf007ae 100644
--- a/app/latest/java/org/matthiaszimmermann/location/egm96/Geoid.java
+++ b/app/latest/java/org/matthiaszimmermann/location/egm96/Geoid.java
@@ -39,6 +39,7 @@ public class Geoid {
 	private static short offset_south_pole = 0;
 	private static boolean s_model_ok = false;
 
+	@SuppressWarnings("UnusedReturnValue")
 	public static boolean init(InputStream is) {
 		if(s_model_ok) {
 			return true;
diff --git a/app/latest/java/org/runnerup/feedwidget/FeedWidgetProvider.java b/app/latest/java/org/runnerup/feedwidget/FeedWidgetProvider.java
index 3494d07dc..902f00564 100644
--- a/app/latest/java/org/runnerup/feedwidget/FeedWidgetProvider.java
+++ b/app/latest/java/org/runnerup/feedwidget/FeedWidgetProvider.java
@@ -32,12 +32,15 @@ private class ProgressDialogStub extends ProgressDialog {
         public void setCancelable(boolean cancelable) {}
         public void show() {}
         public void dismiss() {}
+        @SuppressWarnings("EmptyMethod")
         public void setTitle(String title) {}
+        @SuppressWarnings("EmptyMethod")
         public void setMessage(String message) {}
         public Button getButton(int pos) { return null; }
         public void cancel() {}
         public void setCanceledOnTouchOutside(boolean canceled) {}
         public void setMax(int max) {}
+        @SuppressWarnings("EmptyMethod")
         public void setButton(int pos, String arg, DialogInterface.OnClickListener listener) {}
         public void setProgress(int progress) {}
     }
diff --git a/app/latest/java/org/runnerup/feedwidget/FeedWidgetService.java b/app/latest/java/org/runnerup/feedwidget/FeedWidgetService.java
index 738e6a062..77c43cf3e 100644
--- a/app/latest/java/org/runnerup/feedwidget/FeedWidgetService.java
+++ b/app/latest/java/org/runnerup/feedwidget/FeedWidgetService.java
@@ -1,12 +1,10 @@
 package org.runnerup.feedwidget;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.content.Intent;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
-import android.os.Build;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
@@ -23,7 +21,7 @@
 
 import java.text.DateFormat;
 
-@TargetApi(Build.VERSION_CODES.HONEYCOMB)
+
 public class FeedWidgetService extends RemoteViewsService {
     @Override
     public RemoteViewsFactory onGetViewFactory(Intent intent) {
@@ -62,8 +60,7 @@ public RemoteViews getViewAt(int position) {
                     Log.w(getClass().getSimpleName(), "getViewAt: " + position + " is invalid position!");
                     return null;
                 }
-                final RemoteViews rv = getViewFactorizedAt(position);
-                return rv;
+                return getViewFactorizedAt(position);
             }
 
             // code is mainly a copy/paste from FeedActivity.java:getViewAt - however it could/should be done properly byy refactoring
diff --git a/app/latest/java/org/runnerup/tracker/component/TrackerPebble.java b/app/latest/java/org/runnerup/tracker/component/TrackerPebble.java
index 7d9eb20c9..557172946 100644
--- a/app/latest/java/org/runnerup/tracker/component/TrackerPebble.java
+++ b/app/latest/java/org/runnerup/tracker/component/TrackerPebble.java
@@ -16,12 +16,10 @@
  */
 package org.runnerup.tracker.component;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.os.Build;
 import android.preference.PreferenceManager;
 import android.support.v4.content.LocalBroadcastManager;
 import android.widget.Toast;
@@ -45,7 +43,7 @@
 
 import java.util.HashMap;
 
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+
 public class TrackerPebble extends DefaultTrackerComponent implements WorkoutObserver, WorkoutStepListener, ValueModel.ChangeListener<TrackerState> {
     public static final String NAME = "PEBBLE";
     private Context context;
@@ -53,7 +51,7 @@ public class TrackerPebble extends DefaultTrackerComponent implements WorkoutObs
     private Formatter formatter;
     private boolean isMetric;
     private boolean bMetricSent;
-    private Tracker tracker;
+    private final Tracker tracker;
 
     public TrackerPebble(Tracker tracker) {
         this.tracker = tracker;
@@ -153,7 +151,7 @@ public void onStepChanged(Step oldStep, Step newStep) {
 
     }
 
-    public void customizeWatchApp() {
+    private void customizeWatchApp() {
         try {
             final String customAppName = "RunnerUp";
             final Bitmap customIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_icon_runnerup30x30);
diff --git a/app/latest/java/org/runnerup/tracker/component/TrackerWear.java b/app/latest/java/org/runnerup/tracker/component/TrackerWear.java
index 973fc770c..4c4573c28 100644
--- a/app/latest/java/org/runnerup/tracker/component/TrackerWear.java
+++ b/app/latest/java/org/runnerup/tracker/component/TrackerWear.java
@@ -16,14 +16,13 @@
  */
 package org.runnerup.tracker.component;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 import android.util.Pair;
@@ -61,33 +60,31 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 
 import static com.google.android.gms.wearable.PutDataRequest.WEAR_URI_SCHEME;
 
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
+
 public class TrackerWear extends DefaultTrackerComponent
         implements Constants, TrackerComponent, WorkoutObserver, NodeApi.NodeListener,
         MessageApi.MessageListener, DataApi.DataListener, WorkoutStepListener, ValueModel.ChangeListener<TrackerState> {
 
     public static final String NAME = "WEAR";
-    private Tracker tracker;
+    private final Tracker tracker;
     private Context context;
     private GoogleApiClient mGoogleApiClient;
     private Formatter formatter;
-    private HashSet<Node> connectedNodes = new HashSet<>();
+    //@SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
+    //private final HashSet<Node> connectedNodes = new HashSet<>();
     private String wearNode;
 
     private final Handler handler = new Handler();
     private Bundle lastCreatedWorkoutEvent;
     private Bundle lastSentWorkoutEvent;
-    private long tickFrequency = 1000;
-    private long tickFrequencyPause = 500; // so that seconds does show "slowly"
     private boolean mWorkoutSenderRunning = false;
 
-    private ArrayList<Integer> screenSizes = new ArrayList<>();
-    private List<List<Pair<Pair<Scope, Dimension>, Formatter.Format>>> screens = new ArrayList<>(3);
+    private final ArrayList<Integer> screenSizes = new ArrayList<>();
+    private final List<List<Pair<Pair<Scope, Dimension>, Formatter.Format>>> screens = new ArrayList<>(3);
     private Step currentStep;
     private boolean pauseStep;
     private int workoutType;
@@ -101,7 +98,7 @@ public TrackerWear(Tracker tracker) {
         initBasicScreens();
     }
 
-    void initBasicScreens() {
+    private void initBasicScreens() {
         // TODO read this from settings!!
         screens.clear();
         screenSizes.clear();
@@ -122,7 +119,7 @@ void initBasicScreens() {
         }
     }
 
-    void initIntervalScreens() {
+    private void initIntervalScreens() {
         // TODO read this from settings!!
         screens.clear();
         screenSizes.clear();
@@ -138,7 +135,7 @@ void initIntervalScreens() {
         }
     }
 
-    void initWarmupCooldownScreens() {
+    private void initWarmupCooldownScreens() {
         // TODO read this from settings!!
         screens.clear();
         screenSizes.clear();
@@ -201,14 +198,14 @@ public void onConnected(Bundle connectionHint) {
                         /* read already existing data */
                         readData();
 
-                        /** get info about connected nodes in background */
+                        /* get info about connected nodes in background */
                         Wearable.NodeApi.getConnectedNodes(mGoogleApiClient).
 
                                 setResultCallback(
                                         new ResultCallback<NodeApi.GetConnectedNodesResult>() {
 
                                             @Override
-                                            public void onResult (NodeApi.GetConnectedNodesResult nodes){
+                                            public void onResult (@NonNull NodeApi.GetConnectedNodesResult nodes){
                                                 for (Node node : nodes.getNodes()) {
                                                     onPeerConnected(node);
                                                 }
@@ -224,7 +221,7 @@ public void onConnectionSuspended(int cause) {
                 })
                 .addOnConnectionFailedListener(new GoogleApiClient.OnConnectionFailedListener() {
                     @Override
-                    public void onConnectionFailed(ConnectionResult result) {
+                    public void onConnectionFailed(@NonNull ConnectionResult result) {
                         callback.run(TrackerWear.this, ResultCode.RESULT_ERROR);
                     }
                 })
@@ -240,7 +237,7 @@ private void readData() {
                 .setResultCallback(
                         new ResultCallback<DataItemBuffer>() {
                             @Override
-                            public void onResult(DataItemBuffer dataItems) {
+                            public void onResult(@NonNull DataItemBuffer dataItems) {
                                 for (DataItem dataItem : dataItems) {
                                     wearNode = dataItem.getUri().getHost();
                                     Log.e(getName(), "getDataItem => wearNode:" + wearNode);
@@ -258,7 +255,7 @@ private void setData() {
     @Override
     public void onBind(HashMap<String, Object> bindValues) {
         formatter = (Formatter) bindValues.get(Workout.KEY_FORMATTER);
-        workoutType = ((Integer)bindValues.get(Workout.KEY_WORKOUT_TYPE)).intValue();
+        workoutType = (Integer) bindValues.get(Workout.KEY_WORKOUT_TYPE);
         switch (workoutType) {
             case WORKOUT_TYPE.INTERVAL:
             case WORKOUT_TYPE.ADVANCED:
@@ -292,7 +289,7 @@ private void setData(String path, Bundle b) {
                 PutDataRequest.create(path).setData(DataMap.fromBundle(b).toByteArray()))
                 .setResultCallback(new ResultCallback<DataApi.DataItemResult>() {
                     @Override
-                    public void onResult(DataApi.DataItemResult dataItemResult) {
+                    public void onResult(@NonNull DataApi.DataItemResult dataItemResult) {
                         if (!dataItemResult.getStatus().isSuccess()) {
                             Log.e(getName(), "TrackerWear: ERROR: failed to putDataItem, " +
                                     "status code: " + dataItemResult.getStatus().getStatusCode());
@@ -390,7 +387,7 @@ private void sendWorkoutEvent() {
         }
     }
 
-    private Runnable workoutEventSender = new Runnable() {
+    private final Runnable workoutEventSender = new Runnable() {
         @Override
         public void run() {
             sendWorkoutEvent();
@@ -403,6 +400,8 @@ public void run() {
                 return;
 
             mWorkoutSenderRunning = true;
+            long tickFrequencyPause = 500; // so that seconds does show "slowly"
+            long tickFrequency = 1000;
             handler.postDelayed(workoutEventSender,
                     pauseStep ? tickFrequencyPause : tickFrequency);
         }
@@ -471,12 +470,12 @@ public boolean isConnected() {
 
     @Override
     public void onPeerConnected(Node node) {
-        connectedNodes.add(node);
+        //connectedNodes.add(node);
     }
 
     @Override
     public void onPeerDisconnected(Node node) {
-        connectedNodes.remove(node);
+        //connectedNodes.remove(node);
         if (wearNode != null && node.getId().contentEquals(wearNode))
             wearNode = null;
     }
@@ -487,19 +486,15 @@ public void onMessageReceived(final MessageEvent messageEvent) {
         //note: skip state checking, do that in receiver instead
         if (Wear.Path.MSG_CMD_WORKOUT_PAUSE.contentEquals(messageEvent.getPath())) {
             sendLocalBroadcast(Intents.PAUSE_WORKOUT);
-            return;
         } else if (Wear.Path.MSG_CMD_WORKOUT_RESUME.contentEquals(messageEvent.getPath())) {
             sendLocalBroadcast(Intents.RESUME_WORKOUT);
-            return;
         } else if (Wear.Path.MSG_CMD_WORKOUT_NEW_LAP.contentEquals(messageEvent.getPath())) {
             sendLocalBroadcast(Intents.NEW_LAP);
-            return;
         } else if (Wear.Path.MSG_CMD_WORKOUT_START.contentEquals(messageEvent.getPath())) {
             /* send broadcast to StartActivity */
             Intent startBroadcastIntent = new Intent();
             startBroadcastIntent.setAction(Intents.START_WORKOUT);
             context.sendBroadcast(startBroadcastIntent);
-            return;
         }
     }
 
@@ -519,7 +514,7 @@ public ResultCode onEnd(Callback callback, Context context) {
                 Wearable.MessageApi.removeListener(mGoogleApiClient, this);
                 Wearable.NodeApi.removeListener(mGoogleApiClient, this);
                 Wearable.DataApi.removeListener(mGoogleApiClient, this);
-                connectedNodes.clear();
+                //connectedNodes.clear();
             }
             mGoogleApiClient.disconnect();
             mGoogleApiClient = null;
diff --git a/app/latest/java/org/runnerup/util/MapWrapper.java b/app/latest/java/org/runnerup/util/MapWrapper.java
index 78cc88179..1f82895d8 100644
--- a/app/latest/java/org/runnerup/util/MapWrapper.java
+++ b/app/latest/java/org/runnerup/util/MapWrapper.java
@@ -17,7 +17,7 @@
 
 package org.runnerup.util;
 
-import android.annotation.TargetApi;
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
@@ -54,7 +54,7 @@
 
 import static org.runnerup.util.Formatter.Format.TXT_SHORT;
 
-@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
+
 public class MapWrapper implements Constants {
 
     private MapView mapView = null;
@@ -151,6 +151,7 @@ private class LoadParam {
         final long mID;
     }
 
+    @SuppressLint("StaticFieldLeak")
     private class LoadRoute extends AsyncTask<LoadParam, Void, Route> {
         @Override
         protected Route doInBackground(LoadParam... params) {
@@ -221,6 +222,7 @@ protected Route doInBackground(LoadParam... params) {
             return route;
         }
 
+        @SuppressLint("ObsoleteSdkInt")
         @Override
         protected void onPostExecute(Route route) {
 
diff --git a/app/latest/java/org/runnerup/util/NotificationCompat.java b/app/latest/java/org/runnerup/util/NotificationCompat.java
index a64f45d08..3e0fe3877 100644
--- a/app/latest/java/org/runnerup/util/NotificationCompat.java
+++ b/app/latest/java/org/runnerup/util/NotificationCompat.java
@@ -21,9 +21,6 @@
 import android.os.Build;
 import android.support.v4.app.NotificationCompat.Builder;
 
-/**
- * Created by jonas on 2/15/15.
- */
 @SuppressLint("InlinedApi")
 public class NotificationCompat {
 
diff --git a/app/latest/java/org/runnerup/widget/AboutPreference.java b/app/latest/java/org/runnerup/widget/AboutPreference.java
index e755b38ab..83c974cf2 100644
--- a/app/latest/java/org/runnerup/widget/AboutPreference.java
+++ b/app/latest/java/org/runnerup/widget/AboutPreference.java
@@ -17,7 +17,6 @@
 
 package org.runnerup.widget;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -25,7 +24,6 @@
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
 import android.net.Uri;
-import android.os.Build;
 import android.preference.DialogPreference;
 import android.util.AttributeSet;
 import android.view.View;
@@ -36,7 +34,7 @@
 
 import org.runnerup.R;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class AboutPreference extends DialogPreference {
 
     public AboutPreference(Context context, AttributeSet attrs) {
diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 99b6258c8..5d2ad844c 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -1,4950 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 2.3.1">
+<issues format="4" by="lint 2.3.3">
 
     <issue
         id="GradleCompatible"
-        message="All com.android.support libraries must use the exact same version specification (mixing versions can lead to runtime crashes). Found versions 25.2.0, 24.1.0. Examples include `com.android.support:animated-vector-drawable:25.2.0` and `com.android.support:support-v4:24.1.0`">
+        message="All com.android.support libraries must use the exact same version specification (mixing versions can lead to runtime crashes). Found versions 25.3.1, 24.1.0. Examples include `com.android.support:animated-vector-drawable:25.3.1` and `com.android.support:support-v4:24.1.0`">
         <location
             file="build.gradle"/>
     </issue>
 
-    <issue
-        id="TextViewEdits"
-        message="Attribute `android:autoText` should not be used with `&lt;TextView>`: Change element type to `&lt;EditText>` ?"
-        errorLine1="            android:autoText=&quot;false&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout-v14\feed_widget_item.xml"
-            line="93"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="DefaultLocale"
-        message="Implicitly using the default locale is a common source of bugs: Use `String.format(Locale, ...)` instead"
-        errorLine1="                String.format(IMAGE_URL, o.getJSONObject(&quot;from&quot;).getLong(&quot;picture&quot;)));
"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\export\EndomondoSynchronizer.java"
-            line="408"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="DefaultLocale"
-        message="Implicitly using the default locale is a common source of bugs: Use `String.format(Locale, ...)` instead"
-        errorLine1="        c.put(DB.FEED.URL, String.format(WORKOUT_URL,
"
-        errorLine2="                           ^">
-        <location
-            file="src\org\runnerup\export\EndomondoSynchronizer.java"
-            line="416"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="DefaultLocale"
-        message="Implicitly using the default locale is a common source of bugs: Use `String.format(Locale, ...)` instead"
-        errorLine1="            String str_today = String.format(&quot;%1$tY-%1$tm-%1td&quot;, today);
"
-        errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\export\GarminSynchronizer.java"
-            line="529"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="DefaultLocale"
-        message="Implicitly using the default locale is a common source of bugs: Use `String.format(Locale, ...)` instead"
-        errorLine1="            String workout_url = String.format(CALENDAR_URL, today, month);
"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\export\GarminSynchronizer.java"
-            line="530"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="DefaultLocale"
-        message="Implicitly using the default locale is a common source of bugs: Use `String.format(Locale, ...)` instead"
-        errorLine1="        builder.setContentText(String.format(&quot;%s: %d/%d%s&quot;,
"
-        errorLine2="                               ^">
-        <location
-            file="src\org\runnerup\notification\GpsSearchingState.java"
-            line="43"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="DefaultLocale"
-        message="Implicitly using the default locale is a common source of bugs: Use `String.format(Locale, ...)` instead"
-        errorLine1="            JSONObject feed = makeGetRequest(String.format(MY_FEED_URL, access_token, 1, 25));
"
-        errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\export\NikePlusSynchronizer.java"
-            line="389"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="DefaultLocale"
-        message="Implicitly using the default locale is a common source of bugs: Use `String.format(Locale, ...)` instead"
-        errorLine1="            JSONObject feed = makeGetRequest(String.format(FRIEND_FEED_URL, access_token, 1, 25));
"
-        errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\export\NikePlusSynchronizer.java"
-            line="430"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="DefaultLocale"
-        message="Implicitly using the default locale is a common source of bugs: Use `toLowerCase(Locale)` instead. For strings meant to be internal use `Locale.ROOT`, otherwise `Locale.getDefault()`."
-        errorLine1="        String sportName = sport.name().toLowerCase();
"
-        errorLine2="                                        ~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\export\format\RunalyzePost.java"
-            line="333"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="DefaultLocale"
-        message="Implicitly using the default locale is a common source of bugs: Use `toLowerCase(Locale)` instead. For strings meant to be internal use `Locale.ROOT`, otherwise `Locale.getDefault()`."
-        errorLine1="            if (runalyzeSport.toLowerCase().contains(sportName) &amp;&amp;
"
-        errorLine2="                              ~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\export\format\RunalyzePost.java"
-            line="337"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="DefaultLocale"
-        message="Implicitly using the default locale is a common source of bugs: Use `String.format(Locale, ...)` instead"
-        errorLine1="            String filename = String.format(&quot;activity%s%d.tcx&quot;, Long.toString(Math.round(1000 * Math.random())), mID);
"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\export\RuntasticSynchronizer.java"
-            line="288"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `extractNativeLibs` is only used in API level 23 and higher (current min is 15)"
-        errorLine1="  android:extractNativeLibs=&quot;true&quot;"
-        errorLine2="  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="AndroidManifest.xml"
-            line="43"
-            column="3"/>
-    </issue>
-
-    <issue
-        id="UnusedAttribute"
-        message="Attribute `widgetCategory` is only used in API level 17 and higher (current min is 15)"
-        errorLine1="    android:widgetCategory=&quot;home_screen&quot;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\xml-v14\feed_widget_provider_info.xml"
-            line="8"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="InflateParams"
-        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout&apos;s root element)"
-        errorLine1="        TableRow row = (TableRow) inflator.inflate(R.layout.heartratezonerow, null);
"
-        errorLine2="                                                                              ~~~~">
-        <location
-            file="src\org\runnerup\view\HRZonesActivity.java"
-            line="62"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="InflateParams"
-        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout&apos;s root element)"
-        errorLine1="        View view = inflater.inflate(R.layout.whatsnew, null);
"
-        errorLine2="                                                        ~~~~">
-        <location
-            file="src\org\runnerup\view\MainLayout.java"
-            line="292"
-            column="57"/>
-    </issue>
-
-    <issue
-        id="InflateParams"
-        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout&apos;s root element)"
-        errorLine1="                    R.layout.step_dialog, null);
"
-        errorLine2="                                          ~~~~">
-        <location
-            file="src\org\runnerup\view\StepButton.java"
-            line="185"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="GradleDependency"
-        message="A newer version of com.android.support:design than 25.2.0 is available: 25.3.1"
-        errorLine1="    latestCompile &quot;com.android.support:design:${rootProject.ext.supportLibrary}&quot;
"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="124"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="GradleDependency"
-        message="A newer version of com.google.android.gms:play-services-wearable than 10.2.0 is available: 11.0.4"
-        errorLine1="    latestCompile &quot;com.google.android.gms:play-services-wearable:${rootProject.ext.googlePlayServicesVersion}&quot;
"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="130"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="Deprecated"
-        message="`android:singleLine` is deprecated: False is the default, so just remove the attribute"
-        errorLine1="                        android:singleLine=&quot;false&quot; />"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\detail.xml"
-            line="138"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="Deprecated"
-        message="`android:singleLine` is deprecated: False is the default, so just remove the attribute"
-        errorLine1="            android:singleLine=&quot;false&quot; />"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\detail.xml"
-            line="226"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="Deprecated"
-        message="`android:autoText` is deprecated: Use `inputType` instead"
-        errorLine1="            android:autoText=&quot;false&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout-v14\feed_widget_item.xml"
-            line="93"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="Deprecated"
-        message="`android:singleLine` is deprecated: False is the default, so just remove the attribute"
-        errorLine1="        android:singleLine=&quot;false&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\start_manual.xml"
-            line="98"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(&quot;ActivityCleaner&quot;, &quot;lap &quot; + lap + &quot; removed &quot; + res + &quot; locations&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\db\ActivityCleaner.java"
-            line="206"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(Constants.LOG, e.getMessage());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\db\entities\ActivityEntity.java"
-            line="54"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getClass().getName(), Integer.toString(i) + &quot;: putting cache file in: &quot;
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\content\ActivityProvider.java"
-            line="119"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getClass().getName(), &quot;match(&quot; + uri.toString() + &quot;): &quot; + res);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\content\ActivityProvider.java"
-            line="135"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getClass().getName(), &quot;Failed to open cacheFile(&quot; + parcelFile + &quot;)&quot;);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\content\ActivityProvider.java"
-            line="149"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getClass().getName(), &quot;activity: &quot; + activityId + &quot;, file: &quot;
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\content\ActivityProvider.java"
-            line="153"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                        Log.e(getClass().getName(), &quot;export tcx&quot;);
"
-        errorLine2="                        ~~~~~">
-        <location
-            file="src\org\runnerup\content\ActivityProvider.java"
-            line="160"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                        Log.e(getClass().getName(), &quot;export gpx&quot;);
"
-        errorLine2="                        ~~~~~">
-        <location
-            file="src\org\runnerup\content\ActivityProvider.java"
-            line="167"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getClass().getName(), &quot;wrote &quot; + out.first.length() + &quot; bytes...&quot;);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\content\ActivityProvider.java"
-            line="189"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getClass().getName(), &quot;onUpgrade: oldVersion: &quot; + oldVersion + &quot;, newVersion: &quot; + newVersion);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\db\DBHelper.java"
-            line="237"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(&quot;DBHelper&quot;, &quot;execSQL(&quot; + str + &quot;)&quot;);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\db\DBHelper.java"
-            line="324"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getClass().getName(), &quot;update: &quot; + arg1);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\db\DBHelper.java"
-            line="564"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(&quot;DBHelper&quot;, &quot;deleting activity: &quot; + id);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\db\DBHelper.java"
-            line="594"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(Constants.LOG, &quot;No download method implemented for the synchronizer &quot; + getName());
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\export\DefaultSynchronizer.java"
-            line="136"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(&quot;DigifitSynchronizer&quot;, &quot;usage: DigifitSynchronizer username password&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\DigifitSynchronizer.java"
-            line="74"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(&quot;DigifitSynchronizer&quot;, du.connect().toString());
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\export\DigifitSynchronizer.java"
-            line="84"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getName(), &quot;Error: &quot; + line);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\export\DigifitSynchronizer.java"
-            line="203"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getName(), &quot;export file not ready on Digifit within deadline&quot;);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\DigifitSynchronizer.java"
-            line="254"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;Expected &quot; + fileSize + &quot; bytes, got &quot; + cnt + &quot; bytes: &quot;
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\DigifitSynchronizer.java"
-            line="272"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getName(), exportListResponse.toString());
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\export\DigifitSynchronizer.java"
-            line="328"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), ex.toString());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\DigifitSynchronizer.java"
-            line="426"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;Digifit returned uploadUrl = &quot; + uploadUrl);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\DigifitSynchronizer.java"
-            line="454"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;Digifit returned: &quot; + ex);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\DigifitSynchronizer.java"
-            line="472"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getClass().getName(), &quot;suppressing trigger! distance: &quot; + distance + &quot;, lapDistance: &quot;
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\workout\EndOfLapSuppression.java"
-            line="109"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;FAIL: code: &quot; + responseCode + &quot;, msg=&quot; + amsg + &quot;, res=&quot;
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\EndomondoSynchronizer.java"
-            line="208"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;workoutId: &quot; + workoutId);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\EndomondoSynchronizer.java"
-            line="262"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;res: &quot; + res.toString());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\EndomondoSynchronizer.java"
-            line="290"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;now: &quot; + now + &quot;, endTime: &quot; + endTime + &quot;, now + ONE_DAY: &quot;
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\FacebookSynchronizer.java"
-            line="232"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;createdCourseObj: &quot; + ref.toString());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\FacebookSynchronizer.java"
-            line="253"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getName(), &quot;createdRunObj: &quot; + ret.toString());
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\FacebookSynchronizer.java"
-            line="257"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getName(), &quot;fail createdRunObj: &quot; + e);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\FacebookSynchronizer.java"
-            line="262"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;fail createdCourseObj: &quot; + e);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\FacebookSynchronizer.java"
-            line="267"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(Constants.LOG, e.getMessage());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\db\entities\FeedEntity.java"
-            line="44"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(&quot;FeedImageLoader&quot;, &quot;url exception for &quot; + fixedUrl + &quot;: &quot; + e.getMessage());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\feed\FeedImageLoader.java"
-            line="56"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.i(&quot;FeedImageLoader&quot;, &quot;Found cached image for &quot; + url);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\feed\FeedImageLoader.java"
-            line="65"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.i(&quot;FeedImageLoader&quot;, &quot;Downloading image for &quot; + url);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\feed\FeedImageLoader.java"
-            line="68"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                        Log.e(&quot;FeedImageLoader&quot;, &quot;url exception for &quot; + fixedUrl + &quot;: &quot; + e.getMessage());
"
-        errorLine2="                        ~~~~~">
-        <location
-            file="src\org\runnerup\feed\FeedImageLoader.java"
-            line="84"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.i(getClass().getSimpleName(), &quot;FeedUpdater: &quot; + synchronizer + &quot;, added: &quot; + added + &quot;, discarded: &quot;
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\feed\FeedList.java"
-            line="162"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                        Log.i(&quot;FeedList&quot;, &quot;fail at &quot; + k + &quot; c0: &quot; + c0.getAsString(k) + &quot;, c1: &quot;
"
-        errorLine2="                        ~~~~~">
-        <location
-            file="src\org\runnerup\feed\FeedList.java"
-            line="279"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.i(&quot;FeedList&quot;, &quot;fail at d0: &quot; + d0.toString() + &quot;, d1: &quot; + d1.toString());
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\feed\FeedList.java"
-            line="327"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                            Log.i(&quot;FeedList&quot;, &quot;fail at dur0: &quot; + dur0 + &quot;dur1: &quot; + dur1
"
-        errorLine2="                            ~~~~~">
-        <location
-            file="src\org\runnerup\feed\FeedList.java"
-            line="339"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                            Log.i(&quot;FeedList&quot;, &quot;fail at dis0: &quot; + dur0 + &quot;dis1: &quot; + dur1
"
-        errorLine2="                            ~~~~~">
-        <location
-            file="src\org\runnerup\feed\FeedList.java"
-            line="357"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.i(&quot;FeedList&quot;, &quot;dur_match: &quot; + dur_match + &quot;, dis_match: &quot; + dis_match + &quot;, c0: &quot;
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\feed\FeedList.java"
-            line="371"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getClass().getSimpleName(), &quot;Feed already being refreshed, cancelling this request&quot;);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="latest\java\org\runnerup\feedwidget\FeedWidgetProvider.java"
-            line="48"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.i(getClass().getSimpleName(), &quot;Downloading latest feed...&quot;);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="latest\java\org\runnerup\feedwidget\FeedWidgetProvider.java"
-            line="50"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.i(getClass().getSimpleName(), &quot;Updating feed widget with id &quot; + appWidgetId);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="latest\java\org\runnerup\feedwidget\FeedWidgetProvider.java"
-            line="80"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.w(getClass().getSimpleName(), &quot;getViewAt: &quot; + position + &quot; is invalid position!&quot;);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="latest\java\org\runnerup\feedwidget\FeedWidgetService.java"
-            line="62"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getClass().getSimpleName(), &quot;Unexpected feed type&quot;);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="latest\java\org\runnerup\feedwidget\FeedWidgetService.java"
-            line="168"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(&quot;Formatter&quot;, &quot;Audio language: &quot; +
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\util\Formatter.java"
-            line="138"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(&quot;Formatter&quot;, &quot;guessDefaultUnit: countryCode: &quot; + countryCode);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\util\Formatter.java"
-            line="214"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.i(getName(), &quot;FunBeat.START_URL => code: &quot; + responseCode + &quot;(&quot; + amsg
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\FunBeatSynchronizer.java"
-            line="196"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getName(), &quot;FunBeatSynchronizer::connect() - got &quot; + responseCode
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\export\FunBeatSynchronizer.java"
-            line="246"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getName(), &quot;FunBeatSynchronizer::upload() - got &quot; + responseCode + &quot;, msg: &quot;
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\FunBeatSynchronizer.java"
-            line="402"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getName(), &quot;ok: &quot; + ok);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\FunBeatSynchronizer.java"
-            line="450"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;Unknown workout &quot; + typeString + &quot; with ID &quot; + TypeID);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\FunBeatSynchronizer.java"
-            line="590"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;GarminSynchronizer.connect() CHOOSE_URL => code: &quot; + responseCode
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\GarminSynchronizer.java"
-            line="164"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getName(), &quot;GarminSynchronizer::connect() - got &quot; + responseCode + &quot;, msg: &quot;
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\GarminSynchronizer.java"
-            line="206"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;code: &quot; + responseCode + &quot;, msg=&quot; + amsg);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\GarminSynchronizer.java"
-            line="236"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;checkLogin: str: &quot; + str);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\GarminSynchronizer.java"
-            line="254"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getName(), &quot;GarminSynchronizer::connect() missing username, obj: &quot;
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\GarminSynchronizer.java"
-            line="265"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getName(), &quot;ticket: &quot; + ticket);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\export\GarminSynchronizer.java"
-            line="316"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;attempt: &quot; + i + &quot; => code: &quot; + code);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\GarminSynchronizer.java"
-            line="327"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.w(getName(), &quot;Workout of type &quot; + Sport.valueOf(s.getDbValue()) + &quot; not supported by Garmin&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\GarminSynchronizer.java"
-            line="388"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getName(), &quot;Setting sport activity to &quot; + value + &quot; for workout &quot; + garminID);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\export\GarminSynchronizer.java"
-            line="401"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;downloaded workout key: &quot; + key + &quot; &quot; + cnt + &quot; bytes from &quot;
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\GarminSynchronizer.java"
-            line="627"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.i(getClass().getName(), &quot;Creating new dataSource: &quot; + type.getDataStreamId(this));
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\format\GoogleFitData.java"
-            line="197"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.i(getName(), SyncHelper.parse(new GZIPInputStream(connect.getErrorStream())).toString());
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\export\GoogleFitSynchronizer.java"
-            line="198"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.i(getName(), SyncHelper.parse(new GZIPInputStream(connect.getInputStream())).toString());
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\export\GoogleFitSynchronizer.java"
-            line="202"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(&quot;GoogleStaticMap&quot;, &quot; => &quot; + dst.toString());
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\export\format\GoogleStaticMap.java"
-            line="52"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(&quot;GoogleStaticMap&quot;, &quot;count: &quot; + count + &quot;, avgLen: &quot; + avgLen + &quot;, points: &quot;
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\format\GoogleStaticMap.java"
-            line="130"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getClass().getName(), &quot;graph: &quot; + paceList.size() + &quot; points&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\util\GraphWrapper.java"
-            line="388"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getClass().getName(), &quot;&quot;);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\util\GraphWrapper.java"
-            line="428"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getClass().getName(), &quot;\n&quot;);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\util\GraphWrapper.java"
-            line="469"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getClass().getName(), &quot;btName: &quot; + btName);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\view\HRSettingsActivity.java"
-            line="275"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getClass().getName(), &quot;btAddress: &quot; + btAddress);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\view\HRSettingsActivity.java"
-            line="276"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getClass().getName(), &quot;btProviderName: &quot; + btProviderName);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\view\HRSettingsActivity.java"
-            line="277"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getClass().getName(), &quot;&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\util\HRZones.java"
-            line="63"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getClass().getName(), &quot;value: &quot; + value + &quot;, z: &quot; + z + &quot;, lo: &quot; + lo + &quot;, hi: &quot; + hi
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\util\HRZones.java"
-            line="91"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getClass().getName(), &quot;loaded &quot; + (zone + 1) + &quot; &quot; + values.first + &quot;-&quot;
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\view\HRZonesActivity.java"
-            line="162"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getClass().getName(), &quot; &quot; + vals.lastElement());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\view\HRZonesActivity.java"
-            line="214"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getClass().getName(), &quot;Not enough space to display the heart-rate zone bar&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\view\HRZonesBar.java"
-            line="80"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;reply: &quot; + e.getTextContent());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\JoggSESynchronizer.java"
-            line="179"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;reply: &quot; + e.getTextContent());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\JoggSESynchronizer.java"
-            line="299"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(Constants.LOG, e.getMessage());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\db\entities\LapEntity.java"
-            line="44"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getClass().getName(), &quot;app-version: &quot; + versionCode + &quot;, upgradeState: &quot; + upgradeState
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\view\MainLayout.java"
-            line="122"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.i(getClass().getSimpleName(), &quot;Importing database from &quot; + filePath);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\view\MainLayout.java"
-            line="183"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.v(getClass().getName(), &quot;Found: &quot; + src + &quot;, &quot; + dst + &quot;, isFile: &quot; + isFile);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\view\MainLayout.java"
-            line="214"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                        Log.w(getClass().getName(), &quot;Failed to copy &quot; + src + &quot; as \&quot;&quot; + dstBase
"
-        errorLine2="                        ~~~~~">
-        <location
-            file="src\org\runnerup\view\MainLayout.java"
-            line="221"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                        Log.v(getClass().getName(), &quot;Skip: &quot; + dst +
"
-        errorLine2="                        ~~~~~">
-        <location
-            file="src\org\runnerup\view\MainLayout.java"
-            line="230"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                        Log.v(getClass().getName(), &quot;Skip already existing pref: &quot; + key);
"
-        errorLine2="                        ~~~~~">
-        <location
-            file="src\org\runnerup\view\MainLayout.java"
-            line="240"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.v(getClass().getName(), &quot;Copying: &quot; + dst);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\view\MainLayout.java"
-            line="246"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.v(&quot;MainLayout&quot;, s);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\view\MainLayout.java"
-            line="397"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.i(&quot;MainLayout&quot;, s);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\view\MainLayout.java"
-            line="401"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.w(&quot;MainLayout&quot;, s);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\view\MainLayout.java"
-            line="407"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.i(getClass().getName(), &quot;scheme: &quot; + data.toString());
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\view\ManageWorkoutsActivity.java"
-            line="163"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.i(getClass().getName(), &quot;status: &quot; + status);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\view\ManageWorkoutsActivity.java"
-            line="731"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getName(), &quot;obj: &quot; + obj);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\export\MapMyRunSynchronizer.java"
-            line="215"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getName(), obj.toString());
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\MapMyRunSynchronizer.java"
-            line="276"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.v(getClass().getName(), &quot;Added polyline&quot;);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="latest\java\org\runnerup\util\MapWrapper.java"
-            line="238"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.v(getClass().getName(), &quot;Added &quot; + route.markers.size() + &quot; markers&quot;);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="latest\java\org\runnerup\util\MapWrapper.java"
-            line="276"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getClass().getSimpleName(), s.ex.getMessage());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\NikePlusSynchronizer.java"
-            line="225"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getClass().getSimpleName(), &quot;Failed for profile &apos;&quot; + profile + &quot;&apos; because of the following: &quot; + e.getMessage());
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\NikePlusSynchronizer.java"
-            line="421"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.i(getClass().getSimpleName(), &quot;No friends found, skipping their feed...&quot;);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\NikePlusSynchronizer.java"
-            line="433"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                        Log.e(getClass().getName(), &quot;e: &quot; + e);
"
-        errorLine2="                        ~~~~~">
-        <location
-            file="src\org\runnerup\export\oauth2client\OAuth2Activity.java"
-            line="178"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getClass().getName(), &quot;setLanguage(&quot; + locale.getDisplayLanguage() + &quot;) => &quot; + res);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\workout\feedback\RUTextToSpeech.java"
-            line="70"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getClass().getName(), &quot;setLanguage(&quot;+locale.getDisplayLanguage()+&quot;) => MISSING: &quot; + res);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\workout\feedback\RUTextToSpeech.java"
-            line="74"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getClass().getName(), &quot;speak (mute: &quot; + mute + &quot;): &quot; + text);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\workout\feedback\RUTextToSpeech.java"
-            line="97"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getClass().getName(), &quot;buffer speak: &quot; + text);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\workout\feedback\RUTextToSpeech.java"
-            line="108"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getClass().getName(), &quot;skip buffer (duplicate) speak: &quot; + text);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\workout\feedback\RUTextToSpeech.java"
-            line="114"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getClass().getName(), &quot;Could not get audio focus.&quot;);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\workout\feedback\RUTextToSpeech.java"
-            line="149"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getClass().getName(), &quot;res == ERROR emit() text: &quot; + e.text + &quot;, utId: &quot; + utId
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\workout\feedback\RUTextToSpeech.java"
-            line="187"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getClass().getName(), &quot;onConfigurationChange => do NOTHING!!&quot;);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\view\RunActivity.java"
-            line="143"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(Constants.LOG, e.getMessage());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\format\RunKeeper.java"
-            line="192"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(Constants.LOG, ex.getMessage());
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="140"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(Constants.LOG, e.getMessage());
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="208"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(Constants.LOG, e.getMessage());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="232"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(Constants.LOG, e.getMessage());
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="251"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(Constants.LOG, e.getMessage());
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="299"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(Constants.LOG, &quot; => retry with REST_URL: &quot; + REST_URL);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="300"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(Constants.LOG, ex.getMessage());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="315"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(Constants.LOG, e.getMessage());
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="354"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(Constants.LOG, e.getMessage());
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="358"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(Constants.LOG, e.getMessage());
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="378"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(Constants.LOG, &quot;url: &quot; + newurl.toString());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="417"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;Failed to upload: &quot; + ex.getMessage());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="444"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(Constants.LOG, e.getMessage());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="497"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(Constants.LOG, e.getMessage());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="501"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(Constants.LOG, s.ex.getMessage());
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="568"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                            Log.w(getName(), &quot;Unknown sport with id &quot; + d.getString(&quot;activityType&quot;));
"
-        errorLine2="                            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="605"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                        Log.e(Constants.LOG, ex.getMessage());
"
-        errorLine2="                        ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="634"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(Constants.LOG, e.getMessage());
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="639"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(Constants.LOG, e.getMessage());
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="642"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.d(getClass().getName(), &quot;Using runalyze sport=&quot; + sportFound + &quot;(&quot; + sportId + &quot;)&quot;);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\export\format\RunalyzePost.java"
-            line="344"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.d(getClass().getName(), &quot;Using runalyze type=&quot; + typeFound + &quot;(&quot; + typeId + &quot;)&quot;);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\export\format\RunalyzePost.java"
-            line="365"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.d(getClass().getName(), &quot;Kcal using sports value: &quot; + sports.get(sportFound).get(&quot;data-kcal&quot;));
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\format\RunalyzePost.java"
-            line="372"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.d(getClass().getName(), &quot;Kcal using defaults value&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\format\RunalyzePost.java"
-            line="375"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getName(), &quot;Error closing input&quot;, e);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="198"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getName(), &quot;Error closing output&quot;, e);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="205"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.d(getName(), result);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="208"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.d(getName(), &quot;cookie found = &quot; + e);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="223"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.d(getName(), &quot;cookies=&quot; + cookies);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="238"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.d(getName(), &quot;CSRF token = &quot; + _csrf_token);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="246"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;Failed to get CSRF token&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="248"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.d(getName(), &quot;URL=&quot; + url);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="261"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.d(getName(), response);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="270"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;Malformed URL&quot;, e);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="276"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;Protocol Exception&quot;, e);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="278"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;IO Exception&quot;, e);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="280"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.d(getName(), &quot;Login enter&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="293"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.d(getName(), &quot;URL=&quot; + url);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="295"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.d(getName(), &quot;Login exit OK&quot;);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="316"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getName(), &quot;Invalid response code &quot; + conn.getResponseCode());
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="319"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.d(getName(), &quot;Login exit ERROR&quot;);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="320"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;Malformed URL&quot;, e);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="324"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;Protocol Exception&quot;, e);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="326"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;IO Exception&quot;, e);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="328"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getName(), &quot;Error closing writer&quot;, e);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="335"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.d(getName(), &quot;Login exit ERROR&quot;);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="338"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.d(getName(), &quot;sports=&quot; + _sports);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="448"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.d(getName(), &quot;types=&quot; + _types);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="449"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;Could not parse sportid and typeid. Malformed URL&quot;, e);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="451"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;Could not parse sportid and typeid. Protocol Exception&quot;, e);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="453"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;Could not parse sportid and typeid. IO Exception&quot;, e);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="455"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.d(getName(), &quot;Detected version 2.x&quot;);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="480"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.d(getName(), &quot;Detected version 3.x&quot;);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="484"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.d(getName(), &quot;URL=&quot; + url);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="514"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getName(), &quot;Error code: &quot; + conn.getResponseCode());
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="526"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;Error importing into Runalyze: &quot;, ex);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="535"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getName(), &quot;Error closing the writer&quot;, e);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunalyzeSynchronizer.java"
-            line="542"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.v(getClass().getSimpleName(), &quot;Failed to push data: &quot;+code);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunnerUpLiveSynchronizer.java"
-            line="254"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;code: &quot; + responseCode + &quot;, amsg: &quot; + amsg);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunningAHEADSynchronizer.java"
-            line="217"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getName(), &quot;Unhandled response from RunningAHEADSynchronizer: &quot; + obj);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunningAHEADSynchronizer.java"
-            line="237"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(LOG_TAG, &quot;connect failed&quot;, exception);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunningFreeOnlineSynchronizer.java"
-            line="117"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(LOG_TAG, String.format(&quot;Upload failed; Service said &apos;%s&apos;&quot;, errorMessage));
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunningFreeOnlineSynchronizer.java"
-            line="227"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(LOG_TAG, &quot;upload failed&quot;, exception);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RunningFreeOnlineSynchronizer.java"
-            line="250"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.i(getName(), &quot;userId: &quot; + userId + &quot;, authToken: &quot; + authToken);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\export\RuntasticSynchronizer.java"
-            line="155"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.i(getName(), &quot;found url2: &quot; + url2);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RuntasticSynchronizer.java"
-            line="229"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.i(getName(), &quot;ret: &quot; + ret);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RuntasticSynchronizer.java"
-            line="310"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.i(getName(), &quot;ret: &quot; + ret);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RuntasticSynchronizer.java"
-            line="318"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.i(getName(), &quot;import_id: &quot; + import_id);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RuntasticSynchronizer.java"
-            line="324"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.i(getName(), &quot;code: &quot; + responseCode + &quot;, html: &quot; + getFormValues(conn));
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\export\RuntasticSynchronizer.java"
-            line="343"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;ex: &quot; + s.ex);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\RuntasticSynchronizer.java"
-            line="360"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.i(activity.getClass().getSimpleName(), s);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\view\SettingsActivity.java"
-            line="146"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.i(activity.getClass().getSimpleName(), s);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\view\SettingsActivity.java"
-            line="169"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.i(getClass().getSimpleName(), s);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\view\SettingsActivity.java"
-            line="196"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getClass().getName(), &quot;mTracker.reset()&quot;);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\view\StartActivity.java"
-            line="357"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                        Log.e(getClass().getName(),&quot;onGpsTrackerBound unexpected tracker state: &quot;+mTracker.getState().toString());
"
-        errorLine2="                        ~~~~~">
-        <location
-            file="src\org\runnerup\view\StartActivity.java"
-            line="452"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getClass().getName(), &quot;StartActivity.startGps()&quot;);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\view\StartActivity.java"
-            line="469"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getClass().getName(), &quot;StartActivity.stopGps() skipStop: &quot; + this.skipStopGps);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\view\StartActivity.java"
-            line="481"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getClass().getName(), &quot;data.getStringExtra(\&quot;url\&quot;) => &quot; + data.getStringExtra(&quot;url&quot;));
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\view\StartActivity.java"
-            line="793"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getClass().getName(), &quot;data.getStringExtra(\&quot;ex\&quot;) => &quot; + data.getStringExtra(&quot;ex&quot;));
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\view\StartActivity.java"
-            line="795"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getClass().getName(), &quot;data.getStringExtra(\&quot;obj\&quot;) => &quot; + data.getStringExtra(&quot;obj&quot;));
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\view\StartActivity.java"
-            line="797"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getClass().getName(), &quot;distance: >&quot; + distance + &quot;&lt; duration: >&quot; + duration + &quot;&lt;&quot;);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\view\StartActivity.java"
-            line="1019"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;code: &quot; + responseCode + &quot;, amsg: &quot; + amsg);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\StravaSynchronizer.java"
-            line="252"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getClass().getName(), &quot;Add null!&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\SyncManager.java"
-            line="184"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getClass().getName(), &quot;name not found!&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\SyncManager.java"
-            line="191"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                                Log.e(getClass().getName(), &quot;overwriting &quot; + f.getPath() + &quot; with &quot;
"
-        errorLine2="                                ~~~~~">
-        <location
-            file="src\org\runnerup\export\SyncManager.java"
-            line="927"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                                Log.e(getClass().getName(), &quot;file identical...deleting temporary &quot;
"
-        errorLine2="                                ~~~~~">
-        <location
-            file="src\org\runnerup\export\SyncManager.java"
-            line="935"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.i(getClass().getSimpleName(), &quot;Feed sync ended&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\export\SyncManager.java"
-            line="1200"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.i(getClass().getName(), &quot;time_now &lt; lastTimestamp&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\workout\TargetTrigger.java"
-            line="88"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.i(getClass().getName(), &quot;inited == false&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\workout\TargetTrigger.java"
-            line="94"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getClass().getName(), &quot;state.set(&quot; + getState() + &quot;)&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\tracker\Tracker.java"
-            line="222"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getClass().getName(), &quot;Tracker.connect() - state: &quot; + state.get());
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\tracker\Tracker.java"
-            line="269"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getClass().getName(), &quot; => nextState: &quot; + nextState);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\tracker\Tracker.java"
-            line="276"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getClass().getName(), &quot;Bug23937: gpsTime: &quot; + gpsTime + &quot; utcTime: &quot; + now
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\tracker\Tracker.java"
-            line="669"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getClass().getName(), &quot;lastTime:       &quot; + mActivityLastLocation.getTime());
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\tracker\Tracker.java"
-            line="688"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getClass().getName(), &quot;arg0.getTime(): &quot; + arg0.getTime());
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\tracker\Tracker.java"
-            line="689"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getClass().getName(), &quot; => delta time: &quot; + timeDiff);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\tracker\Tracker.java"
-            line="690"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                    Log.e(getClass().getName(), &quot; => delta dist: &quot; + distDiff);
"
-        errorLine2="                    ~~~~~">
-        <location
-            file="src\org\runnerup\tracker\Tracker.java"
-            line="691"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                                    Log.e(getName(), component.getName() + &quot; &quot; + msg + &quot; => &quot; + resultCode);
"
-        errorLine2="                                    ~~~~~">
-        <location
-            file="src\org\runnerup\tracker\component\TrackerComponentCollection.java"
-            line="238"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                                        Log.e(getName(), component.getName() + &quot; != &quot; + check.getName());
"
-        errorLine2="                                        ~~~~~">
-        <location
-            file="src\org\runnerup\tracker\component\TrackerComponentCollection.java"
-            line="243"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                                        Log.e(getName(), &quot; => runCallback()&quot;);
"
-        errorLine2="                                        ~~~~~">
-        <location
-            file="src\org\runnerup\tracker\component\TrackerComponentCollection.java"
-            line="249"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getName(), component.getName() + &quot; &quot; + msg + &quot; => &quot; + res);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\tracker\component\TrackerComponentCollection.java"
-            line="258"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot; => return directly&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\tracker\component\TrackerComponentCollection.java"
-            line="269"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(&quot;TrackerElevation&quot;, &quot;Altitude correction &quot; + e);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\tracker\component\TrackerElevation.java"
-            line="152"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                                    Log.e(getName(), &quot;getDataItem => wearNode:&quot; + wearNode);
"
-        errorLine2="                                    ~~~~~">
-        <location
-            file="latest\java\org\runnerup\tracker\component\TrackerWear.java"
-            line="246"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(&quot;TrackerWear::onBind()&quot;, &quot;initIntervalScreens()&quot;);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="latest\java\org\runnerup\tracker\component\TrackerWear.java"
-            line="266"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(&quot;TrackerWear::onBind()&quot;, &quot;initBasicScreens()&quot;);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="latest\java\org\runnerup\tracker\component\TrackerWear.java"
-            line="271"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getName(), &quot;setTrackerState(&quot; + val + &quot;)&quot;);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="latest\java\org\runnerup\tracker\component\TrackerWear.java"
-            line="284"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                            Log.e(getName(), &quot;TrackerWear: ERROR: failed to putDataItem, &quot; +
"
-        errorLine2="                            ~~~~~">
-        <location
-            file="latest\java\org\runnerup\tracker\component\TrackerWear.java"
-            line="297"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(getName(), &quot;onMessageReceived: &quot; + messageEvent);
"
-        errorLine2="        ~~~~~">
-        <location
-            file="latest\java\org\runnerup\tracker\component\TrackerWear.java"
-            line="486"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(getName(), &quot;onDataChanged: &quot; + ev.getDataItem().getUri());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="latest\java\org\runnerup\tracker\component\TrackerWear.java"
-            line="558"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                Log.e(getClass().getName(), &quot;trigger: &quot; + this + &quot;suppressed by: &quot; + s);
"
-        errorLine2="                ~~~~~">
-        <location
-            file="src\org\runnerup\workout\Trigger.java"
-            line="57"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.i(Constants.LOG, &quot;Start uploading &quot; + upload.size());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\view\UploadActivity.java"
-            line="390"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.i(Constants.LOG, &quot;Start downloading &quot; + download.size());
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\view\UploadActivity.java"
-            line="406"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.e(&quot;WorkoutBuilder&quot;, &quot;hasEndOfLapTrigger()&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\workout\WorkoutBuilder.java"
-            line="408"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="            Log.i(&quot;WorkoutBuilder&quot;, &quot;setAutolap(&quot; + val + &quot;)&quot;);
"
-        errorLine2="            ~~~~~">
-        <location
-            file="src\org\runnerup\workout\WorkoutBuilder.java"
-            line="617"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                        Log.e(&quot;WorkoutBuilder&quot;, &quot;Added step at index: &quot; + (i + 1));
"
-        errorLine2="                        ~~~~~">
-        <location
-            file="src\org\runnerup\workout\WorkoutBuilder.java"
-            line="670"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="                        Log.e(&quot;WorkoutBuilder&quot;, &quot;Added step at index: &quot; + (i + 1) + &quot; repeat index: &quot;
"
-        errorLine2="                        ~~~~~">
-        <location
-            file="src\org\runnerup\workout\WorkoutBuilder.java"
-            line="675"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(&quot;WorkoutSerializer&quot;, &quot;reading &quot; + fin.getPath());
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\workout\WorkoutSerializer.java"
-            line="468"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="LogNotTimber"
-        message="Using &apos;Log&apos; instead of &apos;Timber&apos;"
-        errorLine1="        Log.e(&quot;WorkoutSerializer&quot;, &quot;writing &quot; + fout.getPath());
"
-        errorLine2="        ~~~~~">
-        <location
-            file="src\org\runnerup\workout\WorkoutSerializer.java"
-            line="478"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="TrulyRandom"
-        message="Potentially insecure random numbers on Android 4.3 and older. Read https://android-developers.blogspot.com/2013/08/some-securerandom-thoughts.html for more info."
-        errorLine1="        cipher.init(Cipher.ENCRYPT_MODE, passwordKey, parameterSpec);
"
-        errorLine2="               ~~~~">
-        <location
-            file="src\org\runnerup\util\Encryption.java"
-            line="108"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="AllowBackup"
-        message="On SDK version 23 and up, your app data will be automatically backed up and restored on app install. Consider adding the attribute `android:fullBackupContent` to specify an `@xml` resource which configures which files to backup. More info: https://developer.android.com/training/backup/autosyncapi.html"
-        errorLine1=" &lt;application"
-        errorLine2=" ^">
-        <location
-            file="latest\AndroidManifest.xml"
-            line="21"
-            column="2"/>
-    </issue>
-
-    <issue
-        id="AllowBackup"
-        message="On SDK version 23 and up, your app data will be automatically backed up and restored on app install. Consider adding the attribute `android:fullBackupContent` to specify an `@xml` resource which configures which files to backup. More info: https://developer.android.com/training/backup/autosyncapi.html"
-        errorLine1=" &lt;application"
-        errorLine2=" ^">
-        <location
-            file="AndroidManifest.xml"
-            line="40"
-            column="2"/>
-    </issue>
-
-    <issue
-        id="Wakelock"
-        message="The `release()` call is not always reached"
-        errorLine1="                mWakeLock.release();
"
-        errorLine2="                          ~~~~~~~">
-        <location
-            file="src\org\runnerup\tracker\Tracker.java"
-            line="780"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_alignParentLeft`"
-        errorLine1="            android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\account.xml"
-            line="36"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_alignParentTop`"
-        errorLine1="            android:layout_alignParentTop=&quot;true&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\account.xml"
-            line="37"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_alignBaseline`"
-        errorLine1="            android:layout_alignBaseline=&quot;@+id/account_list_name&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\account.xml"
-            line="44"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_alignParentTop`"
-        errorLine1="            android:layout_alignParentTop=&quot;true&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\account.xml"
-            line="45"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_toRightOf`"
-        errorLine1="            android:layout_toRightOf=&quot;@+id/account_list_name&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\account.xml"
-            line="46"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_above`"
-        errorLine1="            android:layout_above=&quot;@+id/save_button&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\detail.xml"
-            line="212"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_above`"
-        errorLine1="            android:layout_above=&quot;@+id/save_button&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\detail.xml"
-            line="223"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_above`"
-        errorLine1="            android:layout_above=&quot;@+id/discard_button&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\detail.xml"
-            line="233"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_alignParentBottom`"
-        errorLine1="            android:layout_alignParentBottom=&quot;true&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\detail.xml"
-            line="242"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_alignParentTop`"
-        errorLine1="      android:layout_alignParentTop=&quot;true&quot;"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\upload.xml"
-            line="36"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_alignParentTop`"
-        errorLine1="      android:layout_alignParentTop=&quot;true&quot;"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\upload.xml"
-            line="43"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_toRightOf`"
-        errorLine1="      android:layout_toRightOf=&quot;@+id/account_upload_list_name&quot;"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\upload.xml"
-            line="44"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_above`"
-        errorLine1="      android:layout_above=&quot;@+id/account_download_button&quot;"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\upload.xml"
-            line="99"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_alignParentRight`"
-        errorLine1="      android:layout_alignParentRight=&quot;true&quot;"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\upload.xml"
-            line="100"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_alignParentEnd`"
-        errorLine1="      android:layout_alignParentEnd=&quot;true&quot;/>"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\upload.xml"
-            line="101"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_alignParentBottom`"
-        errorLine1="      android:layout_alignParentBottom=&quot;true&quot;"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\upload.xml"
-            line="110"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_alignParentRight`"
-        errorLine1="      android:layout_alignParentRight=&quot;true&quot;"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\upload.xml"
-            line="111"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="ObsoleteLayoutParam"
-        message="Invalid layout param in a `LinearLayout`: `layout_alignParentEnd`"
-        errorLine1="      android:layout_alignParentEnd=&quot;true&quot;/>"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\upload.xml"
-            line="112"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 15"
-        errorLine1="            if (Build.VERSION.SDK_INT > 10) {
"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\db\entities\AbstractEntity.java"
-            line="87"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is never &lt; 15"
-        errorLine1="        if (Build.VERSION.SDK_INT &lt; Build.VERSION_CODES.GINGERBREAD_MR1)
"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\hr\Bt20Base.java"
-            line="73"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 15"
-        errorLine1="        if (Build.VERSION.SDK_INT > 8) {
"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\DetailActivity.java"
-            line="189"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 15"
-        errorLine1="        if (Build.VERSION.SDK_INT > 8) {
"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\util\GraphWrapper.java"
-            line="67"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 15"
-        errorLine1="            if (Build.VERSION.SDK_INT > 8) {
"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\util\GraphWrapper.java"
-            line="568"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 15"
-        errorLine1="                    android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="latest\java\org\runnerup\util\MapWrapper.java"
-            line="228"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is never &lt; 15"
-        errorLine1="        if (Build.VERSION.SDK_INT &lt; 15) {
"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\workout\feedback\RUTextToSpeech.java"
-            line="212"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        message="Unnecessary; SDK_INT is always >= 15"
-        errorLine1="        if (Build.VERSION.SDK_INT >= 14) {
"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\tracker\component\TrackerTemperature.java"
-            line="84"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="StaticFieldLeak"
-        message="Do not place Android context classes in static fields; this is a memory leak (and also breaks Instant Run)"
-        errorLine1="    private static Context context = null;
"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\export\RunKeeperSynchronizer.java"
-            line="75"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UseSparseArrays"
-        message="Use `new SparseArray&lt;Sport>(...)` instead for better performance"
-        errorLine1="    public static final Map&lt;Integer, Sport> endomondo2sportMap = new HashMap&lt;Integer, Sport>();
"
-        errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\export\EndomondoSynchronizer.java"
-            line="76"
-            column="66"/>
-    </issue>
-
-    <issue
-        id="UseSparseArrays"
-        message="Use `new SparseArray&lt;Sport>(...)` instead for better performance"
-        errorLine1="    static final Map&lt;Integer, Sport> funbeat2sportMap = new HashMap&lt;Integer, Sport>();
"
-        errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\export\FunBeatSynchronizer.java"
-            line="82"
-            column="57"/>
-    </issue>
-
-    <issue
-        id="UseSparseArrays"
-        message="Use `new SparseArray&lt;Sport>(...)` instead for better performance"
-        errorLine1="    static final Map&lt;Integer, Sport> mapmyrun2sportMap = new HashMap&lt;Integer, Sport>();
"
-        errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\export\MapMyRunSynchronizer.java"
-            line="66"
-            column="58"/>
-    </issue>
-
-    <issue
-        id="UseSparseArrays"
-        message="Use `new SparseArray&lt;Sport>(...)` instead for better performance"
-        errorLine1="    static final Map&lt;Integer, Sport> runtastic2sportMap = new HashMap&lt;Integer, Sport>();
"
-        errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\export\RuntasticSynchronizer.java"
-            line="66"
-            column="59"/>
-    </issue>
-
-    <issue
-        id="DisableBaselineAlignment"
-        message="Set `android:baselineAligned=&quot;false&quot;` on this element for better performance"
-        errorLine1="                &lt;LinearLayout"
-        errorLine2="                ^">
-        <location
-            file="res\layout\detail.xml"
-            line="157"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="DisableBaselineAlignment"
-        message="Set `android:baselineAligned=&quot;false&quot;` on this element for better performance"
-        errorLine1="                &lt;LinearLayout"
-        errorLine2="                ^">
-        <location
-            file="res\layout\detail.xml"
-            line="170"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="Overdraw"
-        message="Possible overdraw: Root element paints background `@android:color/background_dark` with a theme that also paints a background (inferred theme is `@style/AppTheme`)"
-        errorLine1="    android:background=&quot;@android:color/background_dark&quot;>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout-v14\feed_widget.xml"
-            line="8"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.drawable.btn_grey` appears to be unused"
-        errorLine1="&lt;selector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot; >"
-        errorLine2="^">
-        <location
-            file="res\drawable\btn_grey.xml"
-            line="18"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.layout.laplist` appears to be unused"
-        errorLine1="&lt;ListView xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
-        errorLine2="^">
-        <location
-            file="res\layout\laplist.xml"
-            line="18"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.mapboxMapID` appears to be unused"
-        errorLine1="    &lt;string name=&quot;mapboxMapID&quot;>cqnqrd.4004d33f&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\values\mapbox.xml"
-            line="19"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UselessParent"
-        message="This `TableRow` layout or its `LinearLayout` parent is possibly useless"
-        errorLine1="    &lt;TableRow"
-        errorLine2="    ^">
-        <location
-            file="res\layout\account_row.xml"
-            line="23"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UselessParent"
-        message="This `TableRow` layout or its `LinearLayout` parent is possibly useless"
-        errorLine1="  &lt;TableRow"
-        errorLine2="  ^">
-        <location
-            file="res\layout\advanced_workout_row.xml"
-            line="7"
-            column="3"/>
-    </issue>
-
-    <issue
-        id="UselessParent"
-        message="This `GridLayout` layout or its `LinearLayout` parent is useless"
-        errorLine1="    &lt;GridLayout"
-        errorLine2="    ^">
-        <location
-            file="res\layout-v14\feed_widget_item.xml"
-            line="26"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UselessParent"
-        message="This `TableRow` layout or its `TableLayout` parent is possibly useless"
-        errorLine1="        &lt;TableRow"
-        errorLine2="        ^">
-        <location
-            file="res\layout\filepermission.xml"
-            line="37"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UselessParent"
-        message="This `LinearLayout` layout or its `LinearLayout` parent is possibly useless"
-        errorLine1="    &lt;LinearLayout"
-        errorLine2="    ^">
-        <location
-            file="res\layout\step_dialog.xml"
-            line="23"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="UselessParent"
-        message="This `LinearLayout` layout or its `LinearLayout` parent is useless"
-        errorLine1=" &lt;LinearLayout"
-        errorLine2=" ^">
-        <location
-            file="res\layout\workout_row.xml"
-            line="23"
-            column="2"/>
-    </issue>
-
-    <issue
-        id="IconLocation"
-        message="Found bitmap drawable `res/drawable/feed_widget_preview.png` in densityless folder">
-        <location
-            file="res\drawable\feed_widget_preview.png"/>
-    </issue>
-
-    <issue
-        id="ButtonStyle"
-        message="Buttons in button bars should be borderless; use `style=&quot;?android:attr/buttonBarButtonStyle&quot;` (and `?android:attr/buttonBarStyle` on the parent)"
-        errorLine1="    &lt;Button"
-        errorLine2="    ^">
-        <location
-            file="res\layout\upload.xml"
-            line="68"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ButtonStyle"
-        message="Buttons in button bars should be borderless; use `style=&quot;?android:attr/buttonBarButtonStyle&quot;` (and `?android:attr/buttonBarStyle` on the parent)"
-        errorLine1="    &lt;Button"
-        errorLine2="    ^">
-        <location
-            file="res\layout\upload.xml"
-            line="75"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="GoogleAppIndexingWarning"
-        message="App is not indexable by Google Search; consider adding at least one Activity with an ACTION-VIEW intent filter. See issue explanation for more details."
-        errorLine1=" &lt;application"
-        errorLine2=" ^">
-        <location
-            file="latest\AndroidManifest.xml"
-            line="21"
-            column="2"/>
-    </issue>
-
-    <issue
-        id="GoogleAppIndexingWarning"
-        message="Missing URL"
-        errorLine1="   &lt;intent-filter>"
-        errorLine2="   ^">
-        <location
-            file="AndroidManifest.xml"
-            line="92"
-            column="4"/>
-    </issue>
-
-    <issue
-        id="GoogleAppIndexingWarning"
-        message="Missing URL"
-        errorLine1="   &lt;intent-filter>"
-        errorLine2="   ^">
-        <location
-            file="AndroidManifest.xml"
-            line="99"
-            column="4"/>
-    </issue>
-
-    <issue
-        id="TextFields"
-        message="The view name (`@+id/url_input`) suggests this is a URI, but it does not include &apos;`textUri`&apos; in the `inputType`"
-        errorLine1="                android:inputType=&quot;textEmailAddress&quot; />"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\userpass.xml"
-            line="52"
-            column="17"/>
-        <location
-            file="res\layout\userpass.xml"
-            line="48"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="ClickableViewAccessibility"
-        message="`org/runnerup/widget/NumberPicker$5#onTouch` should call `View#performClick` when a click is detected"
-        errorLine1="        public boolean onTouch(View v, MotionEvent event) {
"
-        errorLine2="                       ~~~~~~~">
-        <location
-            file="src\org\runnerup\widget\NumberPicker.java"
-            line="229"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="[Accessibility] Missing `contentDescription` attribute on image"
-        errorLine1="        &lt;ImageView"
-        errorLine2="        ^">
-        <location
-            file="res\layout\account.xml"
-            line="40"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="[Accessibility] Missing `contentDescription` attribute on image"
-        errorLine1="        &lt;ImageView"
-        errorLine2="        ^">
-        <location
-            file="res\layout\account_row.xml"
-            line="36"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="[Accessibility] Missing `contentDescription` attribute on image"
-        errorLine1="    &lt;ImageView"
-        errorLine2="    ^">
-        <location
-            file="res\layout-small\feed_row_activity.xml"
-            line="24"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="[Accessibility] Missing `contentDescription` attribute on image"
-        errorLine1="    &lt;ImageView"
-        errorLine2="    ^">
-        <location
-            file="res\layout\feed_row_activity.xml"
-            line="24"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="[Accessibility] Missing `contentDescription` attribute on image"
-        errorLine1="    &lt;ImageButton"
-        errorLine2="    ^">
-        <location
-            file="res\layout-v14\feed_widget.xml"
-            line="10"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="[Accessibility] Missing `contentDescription` attribute on image"
-        errorLine1="        &lt;ImageView"
-        errorLine2="        ^">
-        <location
-            file="res\layout-v14\feed_widget_item.xml"
-            line="34"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="[Accessibility] Missing `contentDescription` attribute on image"
-        errorLine1="            &lt;ImageButton"
-        errorLine2="            ^">
-        <location
-            file="res\layout\start.xml"
-            line="114"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="[Accessibility] Missing `contentDescription` attribute on image"
-        errorLine1="            &lt;ImageButton"
-        errorLine2="            ^">
-        <location
-            file="res\layout\start.xml"
-            line="137"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ContentDescription"
-        message="[Accessibility] Missing `contentDescription` attribute on image"
-        errorLine1="    &lt;ImageView"
-        errorLine2="    ^">
-        <location
-            file="res\layout\upload.xml"
-            line="39"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="                    viewHolder.tv0.setText(&quot;(&quot; + getResources().getString(intensity.getTextId()) + &quot;)&quot;);
"
-        errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\DetailActivity.java"
-            line="499"
-            column="44"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="                    viewHolder.tv0.setText(&quot;(&quot; + getResources().getString(intensity.getTextId()) + &quot;)&quot;);
"
-        errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\DetailActivity.java"
-            line="499"
-            column="44"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="                viewHolder.tvHr.setText(formatter.formatHeartRate(Formatter.Format.TXT_LONG, hr) + &quot; bpm&quot;);
"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\DetailActivity.java"
-            line="520"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="String literal in `setText` can not be translated. Use Android resources instead."
-        errorLine1="                viewHolder.tvHr.setText(formatter.formatHeartRate(Formatter.Format.TXT_LONG, hr) + &quot; bpm&quot;);
"
-        errorLine2="                                                                                                   ~~~~~~">
-        <location
-            file="src\org\runnerup\view\DetailActivity.java"
-            line="520"
-            column="100"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="                tv1.setText(name + &quot; trained &quot; + sport);
"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\FeedActivity.java"
-            line="239"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="                tv1.setText(name + &quot; trained &quot; + sport);
"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\FeedActivity.java"
-            line="239"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="String literal in `setText` can not be translated. Use Android resources instead."
-        errorLine1="                tv1.setText(name + &quot; trained &quot; + sport);
"
-        errorLine2="                                   ~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\FeedActivity.java"
-            line="239"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="                feedStatus.setText(getString(R.string.Synchronizing) + &quot; &quot; + synchronizerName);
"
-        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\FeedActivity.java"
-            line="334"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="                feedStatus.setText(getString(R.string.Synchronizing) + &quot; &quot; + synchronizerName);
"
-        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\FeedActivity.java"
-            line="334"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="                tvBatteryLevel.setText(getResources().getText(R.string.Battery_level) + &quot;: &quot; + hrProvider.getBatteryLevel() + &quot;%&quot;);
"
-        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\HRSettingsActivity.java"
-            line="602"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="                tvBatteryLevel.setText(getResources().getText(R.string.Battery_level) + &quot;: &quot; + hrProvider.getBatteryLevel() + &quot;%&quot;);
"
-        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\HRSettingsActivity.java"
-            line="602"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="                tvBatteryLevel.setText(getResources().getText(R.string.Battery_level) + &quot;: &quot; + hrProvider.getBatteryLevel() + &quot;%&quot;);
"
-        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\HRSettingsActivity.java"
-            line="602"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="        tv.setText(getString(R.string.Zone) + &quot; &quot; + zone + &quot; &quot; + lim.first + &quot;% - &quot; + lim.second + &quot;%&quot;);
"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\HRZonesActivity.java"
-            line="67"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="        tv.setText(getString(R.string.Zone) + &quot; &quot; + zone + &quot; &quot; + lim.first + &quot;% - &quot; + lim.second + &quot;%&quot;);
"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\HRZonesActivity.java"
-            line="67"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="        tv.setText(getString(R.string.Zone) + &quot; &quot; + zone + &quot; &quot; + lim.first + &quot;% - &quot; + lim.second + &quot;%&quot;);
"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\HRZonesActivity.java"
-            line="67"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="        tv.setText(getString(R.string.Zone) + &quot; &quot; + zone + &quot; &quot; + lim.first + &quot;% - &quot; + lim.second + &quot;%&quot;);
"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\HRZonesActivity.java"
-            line="67"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="        tv.setText(getString(R.string.Zone) + &quot; &quot; + zone + &quot; &quot; + lim.first + &quot;% - &quot; + lim.second + &quot;%&quot;);
"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\HRZonesActivity.java"
-            line="67"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="        tv.setText(getString(R.string.Zone) + &quot; &quot; + zone + &quot; &quot; + lim.first + &quot;% - &quot; + lim.second + &quot;%&quot;);
"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\HRZonesActivity.java"
-            line="67"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="        tv.setText(getString(R.string.Zone) + &quot; &quot; + zone + &quot; &quot; + lim.first + &quot;% - &quot; + lim.second + &quot;%&quot;);
"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\HRZonesActivity.java"
-            line="67"
-            column="20"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Number formatting does not take into account locale settings. Consider using `String.format` instead."
-        errorLine1="                lo.setText(Integer.toString(values.first));
"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\HRZonesActivity.java"
-            line="160"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Number formatting does not take into account locale settings. Consider using `String.format` instead."
-        errorLine1="                hi.setText(Integer.toString(values.second));
"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\HRZonesActivity.java"
-            line="161"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Number formatting does not take into account locale settings. Consider using `String.format` instead."
-        errorLine1="                        zones.get(2 * i + 0).setText(Integer.toString(val.first));
"
-        errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\HRZonesActivity.java"
-            line="196"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Number formatting does not take into account locale settings. Consider using `String.format` instead."
-        errorLine1="                        zones.get(2 * i + 1).setText(Integer.toString(val.second));
"
-        errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\HRZonesActivity.java"
-            line="197"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Number formatting does not take into account locale settings. Consider using `String.format` instead."
-        errorLine1="                tv.setText(Long.toString(id));
"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\HistoryActivity.java"
-            line="150"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="        b.setText(&quot;&quot; + c);
"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src\org\runnerup\widget\NumberPicker.java"
-            line="122"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="                    targetPace.setText(formatter.format(Formatter.Format.TXT_SHORT, step.getTargetType(),
"
-        errorLine2="                                       ^">
-        <location
-            file="src\org\runnerup\view\RunActivity.java"
-            line="536"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="                    targetPace.setText(formatter.format(Formatter.Format.TXT_SHORT, step.getTargetType(),
"
-        errorLine2="                                       ^">
-        <location
-            file="src\org\runnerup\view\RunActivity.java"
-            line="536"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="                    durationValue.setText(&quot;&quot; + (step.getCurrentRepeat() + 1) + &quot;/&quot;
"
-        errorLine2="                                          ^">
-        <location
-            file="src\org\runnerup\view\RunActivity.java"
-            line="546"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="                    durationValue.setText(&quot;&quot; + (step.getCurrentRepeat() + 1) + &quot;/&quot;
"
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\RunActivity.java"
-            line="546"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="                    durationValue.setText(&quot;&quot; + (step.getCurrentRepeat() + 1) + &quot;/&quot;
"
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\RunActivity.java"
-            line="546"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="                    durationValue.setText(&quot;&quot; + (step.getCurrentRepeat() + 1) + &quot;/&quot;
"
-        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\RunActivity.java"
-            line="546"
-            column="48"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="            gpsInfoView1.setText(&quot;: &quot; + cnt0 + &quot;/&quot; + cnt1);
"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\StartActivity.java"
-            line="637"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="            gpsInfoView1.setText(&quot;: &quot; + cnt0 + &quot;/&quot; + cnt1);
"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\StartActivity.java"
-            line="637"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="            gpsInfoView1.setText(&quot;: &quot; + cnt0 + &quot;/&quot; + cnt1);
"
-        errorLine2="                                 ~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\StartActivity.java"
-            line="637"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Number formatting does not take into account locale settings. Consider using `String.format` instead."
-        errorLine1="                    hrValueText.setText(Integer.toString(hrVal));
"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\StartActivity.java"
-            line="698"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="            mDurationValue.setText(&quot;&quot; + step.getRepeatCount());
"
-        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\StepButton.java"
-            line="106"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="            mGoalValue.setText(formatter.format(Formatter.Format.TXT_SHORT, goalType,
"
-        errorLine2="                               ^">
-        <location
-            file="src\org\runnerup\view\StepButton.java"
-            line="128"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="            mGoalValue.setText(formatter.format(Formatter.Format.TXT_SHORT, goalType,
"
-        errorLine2="                               ^">
-        <location
-            file="src\org\runnerup\view\StepButton.java"
-            line="128"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="            actionButton.setText(actionButtonText + &quot; (&quot; + syncCount + &quot;)&quot;);
"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\UploadActivity.java"
-            line="241"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="            actionButton.setText(actionButtonText + &quot; (&quot; + syncCount + &quot;)&quot;);
"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\UploadActivity.java"
-            line="241"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="            actionButton.setText(actionButtonText + &quot; (&quot; + syncCount + &quot;)&quot;);
"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\org\runnerup\view\UploadActivity.java"
-            line="241"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="RelativeOverlap"
-        message="`@id/history_list_sport` can overlap `@id/history_list_start_time` if @id/history_list_start_time, @id/history_list_sport grow due to localized text expansion"
-        errorLine1="        &lt;TextView"
-        errorLine2="        ^">
-        <location
-            file="res\layout\history_row.xml"
-            line="38"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RelativeOverlap"
-        message="`@id/upload_list_sport` can overlap `@id/upload_list_start_time` if @id/upload_list_start_time, @id/upload_list_sport grow due to localized text expansion"
-        errorLine1="        &lt;TextView"
-        errorLine2="        ^">
-        <location
-            file="res\layout\upload_row.xml"
-            line="36"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlSymmetry"
-        message="When you define `paddingLeft` you should probably also define `paddingRight` for right-to-left symmetry"
-        errorLine1="    android:paddingLeft=&quot;20dp&quot; >"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\manage_workouts_list_row.xml"
-            line="22"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="            android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\account.xml"
-            line="36"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginStart=&quot;200dp&quot;` to better support right-to-left layouts"
-        errorLine1="            android:layout_marginLeft=&quot;200dp&quot; />"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\account.xml"
-            line="38"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_toEndOf=&quot;@+id/account_list_name&quot;` to better support right-to-left layouts"
-        errorLine1="            android:layout_toRightOf=&quot;@+id/account_list_name&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\account.xml"
-            line="46"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\account_list.xml"
-            line="28"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;right&quot;"
-        errorLine2="                             ~~~~~">
-        <location
-            file="res\layout\detail.xml"
-            line="34"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;right&quot;"
-        errorLine2="                             ~~~~~">
-        <location
-            file="res\layout\detail.xml"
-            line="40"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginEnd=&quot;3dp&quot;` to better support right-to-left layouts"
-        errorLine1="            android:layout_marginRight=&quot;3dp&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\detail.xml"
-            line="46"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;right&quot;"
-        errorLine2="                             ~~~~~">
-        <location
-            file="res\layout\detail.xml"
-            line="47"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginStart=&quot;10dp&quot;` to better support right-to-left layouts"
-        errorLine1="            android:layout_marginLeft=&quot;10dp&quot; >"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\detail.xml"
-            line="63"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginEnd=&quot;3dp&quot;` to better support right-to-left layouts"
-        errorLine1="                android:layout_marginRight=&quot;3dp&quot; />"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\detail.xml"
-            line="88"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="                        android:gravity=&quot;top|left&quot;"
-        errorLine2="                                         ~~~~~~~~">
-        <location
-            file="res\layout\detail.xml"
-            line="134"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:drawableEnd=&quot;@drawable/ic_av_play_arrow&quot;` to better support right-to-left layouts"
-        errorLine1="            android:drawableRight=&quot;@drawable/ic_av_play_arrow&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\detail.xml"
-            line="215"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginEnd=&quot;10dp&quot;` to better support right-to-left layouts"
-        errorLine1="            android:layout_marginRight=&quot;10dp&quot; />"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\feed.xml"
-            line="35"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginStart=&quot;10dp&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_marginLeft=&quot;10dp&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\feed_row_date_header.xml"
-            line="28"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_toEndOf=&quot;@+id/widget_app_icon&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_toRightOf=&quot;@+id/widget_app_icon&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout-v14\feed_widget.xml"
-            line="24"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:layout_gravity=&quot;center_vertical|left&quot; />"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout-v14\feed_widget_item.xml"
-            line="43"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:layout_gravity=&quot;right&quot; />"
-        errorLine2="                                    ~~~~~">
-        <location
-            file="res\layout-v14\feed_widget_item.xml"
-            line="62"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\history.xml"
-            line="28"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="            android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\history_row.xml"
-            line="33"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentEnd=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="            android:layout_alignParentRight=&quot;true&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\history_row.xml"
-            line="42"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;right&quot;"
-        errorLine2="                             ~~~~~">
-        <location
-            file="res\layout\history_row.xml"
-            line="58"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;right&quot;"
-        errorLine2="                             ~~~~~">
-        <location
-            file="res\layout\history_row.xml"
-            line="67"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;right&quot;"
-        errorLine2="                             ~~~~~">
-        <location
-            file="res\layout\history_row.xml"
-            line="76"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginStart=&quot;5dp&quot;` to better support right-to-left layouts"
-        errorLine1="            android:layout_marginLeft=&quot;5dp&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\hr_settings.xml"
-            line="17"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;left&quot;"
-        errorLine2="                             ~~~~">
-        <location
-            file="res\layout\hr_settings.xml"
-            line="18"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginEnd=&quot;3dp&quot;` to better support right-to-left layouts"
-        errorLine1="            android:layout_marginRight=&quot;3dp&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\hr_settings.xml"
-            line="24"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;right&quot;"
-        errorLine2="                             ~~~~~">
-        <location
-            file="res\layout\hr_settings.xml"
-            line="25"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginStart=&quot;10dp&quot;` to better support right-to-left layouts"
-        errorLine1="            android:layout_marginLeft=&quot;10dp&quot; >"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\hr_settings.xml"
-            line="41"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginStart=&quot;5dp&quot;` to better support right-to-left layouts"
-        errorLine1="                android:layout_marginLeft=&quot;5dp&quot;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\hr_settings.xml"
-            line="57"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="                android:gravity=&quot;left&quot; />"
-        errorLine2="                                 ~~~~">
-        <location
-            file="res\layout\hr_settings.xml"
-            line="58"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginEnd=&quot;3dp&quot;` to better support right-to-left layouts"
-        errorLine1="                android:layout_marginRight=&quot;3dp&quot;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\hr_settings.xml"
-            line="63"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="        android:gravity=&quot;right&quot;"
-        errorLine2="                         ~~~~~">
-        <location
-            file="res\layout\laplist_row.xml"
-            line="35"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="        android:gravity=&quot;right&quot;"
-        errorLine2="                         ~~~~~">
-        <location
-            file="res\layout\laplist_row.xml"
-            line="44"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="        android:gravity=&quot;right&quot;"
-        errorLine2="                         ~~~~~">
-        <location
-            file="res\layout\laplist_row.xml"
-            line="52"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="        android:gravity=&quot;right&quot;"
-        errorLine2="                         ~~~~~">
-        <location
-            file="res\layout\laplist_row.xml"
-            line="60"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="        android:gravity=&quot;right&quot;"
-        errorLine2="                         ~~~~~">
-        <location
-            file="res\layout\laplist_row.xml"
-            line="67"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:paddingStart=&quot;20dp&quot;` to better support right-to-left layouts"
-        errorLine1="    android:paddingLeft=&quot;20dp&quot; >"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\manage_workouts_list_row.xml"
-            line="22"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="                android:gravity=&quot;right&quot;"
-        errorLine2="                                 ~~~~~">
-        <location
-            file="res\layout\run.xml"
-            line="37"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="                android:gravity=&quot;right&quot;"
-        errorLine2="                                 ~~~~~">
-        <location
-            file="res\layout\run.xml"
-            line="43"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="                android:gravity=&quot;right&quot;"
-        errorLine2="                                 ~~~~~">
-        <location
-            file="res\layout\run.xml"
-            line="49"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginEnd=&quot;3dp&quot;` to better support right-to-left layouts"
-        errorLine1="                android:layout_marginRight=&quot;3dp&quot;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\run.xml"
-            line="54"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="                android:gravity=&quot;right&quot;"
-        errorLine2="                                 ~~~~~">
-        <location
-            file="res\layout\run.xml"
-            line="55"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginStart=&quot;10dp&quot;` to better support right-to-left layouts"
-        errorLine1="                    android:layout_marginLeft=&quot;10dp&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\run.xml"
-            line="71"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginEnd=&quot;3dp&quot;` to better support right-to-left layouts"
-        errorLine1="                    android:layout_marginRight=&quot;3dp&quot; />"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\run.xml"
-            line="93"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginStart=&quot;10dp&quot;` to better support right-to-left layouts"
-        errorLine1="                    android:layout_marginLeft=&quot;10dp&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\run.xml"
-            line="110"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginEnd=&quot;3dp&quot;` to better support right-to-left layouts"
-        errorLine1="                    android:layout_marginRight=&quot;3dp&quot; />"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\run.xml"
-            line="133"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginStart=&quot;10dp&quot;` to better support right-to-left layouts"
-        errorLine1="                    android:layout_marginLeft=&quot;10dp&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\run.xml"
-            line="149"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="                android:layout_gravity=&quot;right&quot; >"
-        errorLine2="                                        ~~~~~">
-        <location
-            file="res\layout\run.xml"
-            line="156"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginEnd=&quot;3dp&quot;` to better support right-to-left layouts"
-        errorLine1="                    android:layout_marginRight=&quot;3dp&quot; />"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\run.xml"
-            line="172"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:drawableEnd=&quot;@drawable/ic_av_newlap&quot;` to better support right-to-left layouts"
-        errorLine1="            android:drawableRight=&quot;@drawable/ic_av_newlap&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\run.xml"
-            line="221"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:drawableEnd=&quot;@drawable/ic_av_pause&quot;` to better support right-to-left layouts"
-        errorLine1="            android:drawableRight=&quot;@drawable/ic_av_pause&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\run.xml"
-            line="232"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:drawableEnd=&quot;@drawable/ic_av_stop&quot;` to better support right-to-left layouts"
-        errorLine1="            android:drawableRight=&quot;@drawable/ic_av_stop&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\run.xml"
-            line="250"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\settings_wrapper.xml"
-            line="28"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\settings_wrapper.xml"
-            line="37"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_toEndOf=&quot;@+id/gps_info_text&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_toRightOf=&quot;@+id/gps_info_text&quot; />"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\start.xml"
-            line="74"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_toEndOf=&quot;@+id/gps_info1&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_toRightOf=&quot;@+id/gps_info1&quot; />"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\start.xml"
-            line="80"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_toEndOf=&quot;@+id/gps_info2&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_toRightOf=&quot;@+id/gps_info2&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\start.xml"
-            line="85"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:drawableEnd=&quot;@drawable/ic_av_play_arrow&quot;` to better support right-to-left layouts"
-        errorLine1="            android:drawableRight=&quot;@drawable/ic_av_play_arrow&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\start.xml"
-            line="105"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\start_advanced.xml"
-            line="29"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\start_advanced.xml"
-            line="40"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\start_manual.xml"
-            line="29"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\start_manual.xml"
-            line="49"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\start_manual.xml"
-            line="59"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\start_manual.xml"
-            line="70"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\start_manual.xml"
-            line="81"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="        android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\start_manual.xml"
-            line="92"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="        android:gravity=&quot;top|left&quot;"
-        errorLine2="                         ~~~~~~~~">
-        <location
-            file="res\layout\start_manual.xml"
-            line="96"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;center_vertical|left&quot;"
-        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\step_button.xml"
-            line="41"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;center_vertical|left&quot;"
-        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\step_button.xml"
-            line="51"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;center_vertical|right&quot;"
-        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\step_button.xml"
-            line="60"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;center_vertical|left&quot;"
-        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\step_button.xml"
-            line="78"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;center_vertical|left&quot;"
-        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\step_button.xml"
-            line="88"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;center_vertical|right&quot;"
-        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\step_button.xml"
-            line="97"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="        android:gravity=&quot;center_vertical|left&quot;"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\title_spinner.xml"
-            line="33"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="        android:gravity=&quot;center_vertical|right&quot;"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\title_spinner.xml"
-            line="43"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_marginStart=&quot;200dp&quot;` to better support right-to-left layouts"
-        errorLine1="      android:layout_marginLeft=&quot;200dp&quot;/>"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\upload.xml"
-            line="37"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_toEndOf=&quot;@+id/account_upload_list_name&quot;` to better support right-to-left layouts"
-        errorLine1="      android:layout_toRightOf=&quot;@+id/account_upload_list_name&quot;"
-        errorLine2="      ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\upload.xml"
-            line="44"
-            column="7"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="    android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\upload.xml"
-            line="53"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentStart=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="            android:layout_alignParentLeft=&quot;true&quot;"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\upload_row.xml"
-            line="33"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_toStartOf=&quot;@+id/upload_list_check&quot;` to better support right-to-left layouts"
-        errorLine1="            android:layout_toLeftOf=&quot;@+id/upload_list_check&quot; />"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\upload_row.xml"
-            line="41"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Consider adding `android:layout_alignParentEnd=&quot;true&quot;` to better support right-to-left layouts"
-        errorLine1="            android:layout_alignParentRight=&quot;true&quot; />"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res\layout\upload_row.xml"
-            line="48"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;right&quot;"
-        errorLine2="                             ~~~~~">
-        <location
-            file="res\layout\upload_row.xml"
-            line="63"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;right&quot;"
-        errorLine2="                             ~~~~~">
-        <location
-            file="res\layout\upload_row.xml"
-            line="71"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:gravity=&quot;right&quot;"
-        errorLine2="                             ~~~~~">
-        <location
-            file="res\layout\upload_row.xml"
-            line="79"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="         android:gravity=&quot;left&quot;"
-        errorLine2="                          ~~~~">
-        <location
-            file="res\layout\workout_row.xml"
-            line="33"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="         android:gravity=&quot;left&quot;"
-        errorLine2="                          ~~~~">
-        <location
-            file="res\layout\workout_row.xml"
-            line="41"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="         android:gravity=&quot;left&quot; />"
-        errorLine2="                          ~~~~">
-        <location
-            file="res\layout\workout_row.xml"
-            line="49"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="         android:gravity=&quot;left&quot; />"
-        errorLine2="                          ~~~~">
-        <location
-            file="res\layout\workout_row.xml"
-            line="56"
-            column="27"/>
-    </issue>
-
 </issues>
diff --git a/app/lint.xml b/app/lint.xml
index 793fe57c3..19b24d3c6 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
     <issue id="all">
-        <ignore path="../GraphView/**" />
         <ignore path="../ANT-Android-SDKs/**" />
     </issue>
-    <issue id="InvalidPackage">
-        <ignore path="**/com.squareup.okio/**" />
-        <ignore path="**/com.vividsolutions/**" />
-    </issue>
     <issue id="ResourceType">
         <ignore path="src/org/runnerup/view/MainLayout.java" />
     </issue>
     <issue id="MissingQuantity">
-        <!-- Transifex refuses quantity="one" for tr, (gradle) lint requires it, Inspect allows both-->
+        <!-- Transifex refuses quantity="one" for tr,pl (gradle) lint requires it, Inspect allows both-->
         <ignore path="res/values-tr/cues.xml" />
         <ignore path="res/values-pl/cues.xml" />
     </issue>
+    <issue id="UnusedResources">
+        <ignore path="res/drawable-mdpi/a12_googleplus.png" />
+    </issue>
     <issue id="InvalidPackage">
         <ignore regexp=".*okio.*" />
         <ignore regexp=".*retrofit.*" />
+        <ignore path="**/com.squareup.okio/**" />
+        <ignore path="**/com.vividsolutions/**" />
     </issue>
     <issue id="IconDensities">
         <ignore path="res/**" />
@@ -30,4 +30,13 @@
     <issue id="WrongRegion" severity="ignore">
         <ignore regexp="^.*?\Q\res\values-en-rNL\\E.*?$" />
     </issue>
-</lint>
+    <issue id="ObsoleteSdkInt" severity="ignore">
+        <ignore regexp=".*-r14$" />
+    </issue>
+    <!-- used by library? -->
+    <issue id="LogNotTimber" severity="ignore"/>
+    <!-- SuppressLint has no effect in gradle plugin 3.0.0, bug? -->
+    <issue id="ClickableViewAccessibility" severity="ignore">
+        <ignore path="**/NumberPicker.java" />
+    </issue>
+</lint>
\ No newline at end of file
diff --git a/app/res/drawable/feed_widget_preview.png b/app/res/drawable-nodpi/feed_widget_preview.png
similarity index 100%
rename from app/res/drawable/feed_widget_preview.png
rename to app/res/drawable-nodpi/feed_widget_preview.png
diff --git a/app/res/drawable/btn_grey.xml b/app/res/drawable/btn_grey.xml
deleted file mode 100644
index 7aabefab3..000000000
--- a/app/res/drawable/btn_grey.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2012 jonas.oreland@gmail.com
-  ~
-  ~  This program is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 3 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  This program is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-	<item android:state_pressed="true" >
-        <shape>
-            <gradient
-                android:startColor="#818284"
-                android:endColor="#2b2c2d"
-                android:angle="270" />
-            <corners android:radius="5dp"/>
-        </shape>
-    </item>
-    <item android:state_enabled="false">
-        <shape>
-            <gradient
-                android:startColor="#777777"
-                android:endColor="#171717"
-                android:angle="270" />
-            <corners android:radius="5dp"/>
-        </shape>
-    </item>
-	<item>
-        <shape>
-            <gradient
-                android:startColor="#d8d9db"
-                android:endColor="#2b2c2d"
-                android:angle="270" />
-            <corners android:radius="5dp"/>
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/res/layout-small/feed_row_activity.xml b/app/res/layout-small/feed_row_activity.xml
index eab8d22f8..61172eeab 100644
--- a/app/res/layout-small/feed_row_activity.xml
+++ b/app/res/layout-small/feed_row_activity.xml
@@ -18,14 +18,16 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_margin="10dp"
-    android:orientation="horizontal" >
+    android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/feed_image"
         android:layout_width="64dp"
         android:layout_height="64dp"
-        android:layout_margin="2dp" />
+        android:layout_margin="2dp"
+        tools:ignore="ContentDescription" />
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/app/res/layout-v14/feed_widget.xml b/app/res/layout-v14/feed_widget.xml
index e05d6102f..db37168aa 100644
--- a/app/res/layout-v14/feed_widget.xml
+++ b/app/res/layout-v14/feed_widget.xml
@@ -4,8 +4,7 @@
     android:layout_height="match_parent"
     android:padding="@dimen/widget_margin"
     android:id="@+id/widget_layout"
-    tools:showIn="@xml/feed_widget_provider_info"
-    android:background="@android:color/background_dark">
+    tools:showIn="@xml/feed_widget_provider_info">
 
     <ImageButton
         android:layout_width="30dp"
@@ -14,13 +13,14 @@
         android:src="@drawable/ic_feed_widget"
         android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
+        android:layout_alignParentStart="true"
+        tools:ignore="ContentDescription" />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/latest_feed_click_to_refresh"
-        android:id="@+id/textView"
         android:layout_above="@+id/widget_empty"
+        android:layout_toEndOf="@+id/widget_app_icon"
         android:layout_toRightOf="@+id/widget_app_icon"
         android:gravity="center" />
     <ListView
diff --git a/app/res/layout-v14/feed_widget_item.xml b/app/res/layout-v14/feed_widget_item.xml
index d6d85b423..776f6d0b1 100644
--- a/app/res/layout-v14/feed_widget_item.xml
+++ b/app/res/layout-v14/feed_widget_item.xml
@@ -15,18 +15,16 @@
   ~  You should have received a copy of the GNU General Public License
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/feed_widget_item"
     android:layout_width="fill_parent"
     android:layout_height="44dp"
     android:layout_margin="10dp"
-    android:orientation="horizontal" >
+    android:orientation="horizontal"
 
-
-    <GridLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:columnCount="3"
+    android:columnCount="3"
         android:rowCount="3"
         android:columnOrderPreserved="false">
 
@@ -40,7 +38,8 @@
             android:src="@drawable/ic_tab_main_unselected"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_gravity="center_vertical|left" />
+            android:layout_gravity="center_vertical|start"
+            tools:ignore="ContentDescription" />
 
 
         <TextView
@@ -59,7 +58,7 @@
             android:layout_height="wrap_content"
             style="@style/FeedActivitySource"
             android:textAlignment="gravity"
-            android:layout_gravity="right" />
+            android:layout_gravity="end" />
 
         <TextView
             android:layout_row="1"
@@ -90,9 +89,8 @@
             android:maxLines="5"
             android:layout_gravity="fill"
             android:layout_rowSpan="2"
-            android:autoText="false"
+            android:inputType="none"
             android:textSize="12sp" />
 
 
     </GridLayout>
-</LinearLayout>
diff --git a/app/res/layout/account.xml b/app/res/layout/account.xml
index 59f1610d5..b0d789b49 100644
--- a/app/res/layout/account.xml
+++ b/app/res/layout/account.xml
@@ -16,11 +16,11 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/relative_layout1"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
     android:gravity="center_horizontal"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/name"
@@ -33,18 +33,15 @@
             android:id="@+id/account_list_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
+            android:layout_marginStart="200dp"
             android:layout_marginLeft="200dp" />
 
         <ImageView
             android:id="@+id/account_list_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBaseline="@+id/account_list_name"
-            android:layout_alignParentTop="true"
-            android:layout_toRightOf="@+id/account_list_name"
-            android:scaleType="center" />
+            android:scaleType="center"
+            tools:ignore="ContentDescription"/>
     </LinearLayout>
 
    	<TableLayout
diff --git a/app/res/layout/account_list.xml b/app/res/layout/account_list.xml
index 0d49695c9..9e64b2e5f 100644
--- a/app/res/layout/account_list.xml
+++ b/app/res/layout/account_list.xml
@@ -16,7 +16,6 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tab1_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" >
@@ -25,6 +24,7 @@
         android:id="@+id/account_list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
+        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true" >
     </ListView>
diff --git a/app/res/layout/account_row.xml b/app/res/layout/account_row.xml
index d62411af7..8faa0310e 100644
--- a/app/res/layout/account_row.xml
+++ b/app/res/layout/account_row.xml
@@ -15,12 +15,10 @@
   ~  You should have received a copy of the GNU General Public License
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
 
     <TableRow
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/table_row1"
         android:longClickable="true"
         android:layout_width="fill_parent"
@@ -39,7 +37,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:scaleType="center"
-            />
+            tools:ignore="ContentDescription" />
         
         <CheckBox
             android:id="@+id/account_list_upload"
@@ -67,5 +65,3 @@
             android:text="@string/Configure" />
 
     </TableRow>
-
-</LinearLayout>
diff --git a/app/res/layout/advanced_workout_row.xml b/app/res/layout/advanced_workout_row.xml
index e34ae5005..c6f53974d 100644
--- a/app/res/layout/advanced_workout_row.xml
+++ b/app/res/layout/advanced_workout_row.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content">
-
-  <TableRow
+   <TableRow
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:orientation="horizontal"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:id="@+id/workout_row">
+    android:layout_height="fill_parent">
 
     <Button
       android:layout_width="30dp"
@@ -51,6 +47,4 @@
       android:shadowDy="1"
       android:shadowRadius="2"
       />
-  </TableRow>
-
-</LinearLayout>
\ No newline at end of file
+</TableRow>
diff --git a/app/res/layout/detail.xml b/app/res/layout/detail.xml
index 2b13f2054..5d5c2b8ef 100644
--- a/app/res/layout/detail.xml
+++ b/app/res/layout/detail.xml
@@ -16,7 +16,6 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tab1_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical">
@@ -29,22 +28,20 @@
         android:orientation="horizontal" >
 
         <TextView
-            android:id="@+id/total_time"
             style="@style/RunHeader"
-            android:gravity="right"
+            android:gravity="end"
             android:text="@string/time" />
 
         <TextView
-            android:id="@+id/total_distance"
             style="@style/RunHeader"
-            android:gravity="right"
+            android:gravity="end"
             android:text="@string/distance" />
 
         <TextView
-            android:id="@+id/total_pace"
             style="@style/RunHeader"
+            android:layout_marginEnd="3dp"
             android:layout_marginRight="3dp"
-            android:gravity="right"
+            android:gravity="end"
             android:text="@string/pace" />
     </LinearLayout>
 
@@ -57,19 +54,17 @@
         android:orientation="vertical" >
 
         <LinearLayout
-            android:id="@+id/header"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
             android:layout_marginLeft="10dp" >
 
             <TextView
-                android:id="@+id/text_view01"
                 style="@style/RunHeader"
                 android:text="@string/Total" />
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/linear_layout3"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal" >
@@ -85,6 +80,7 @@
             <TextView
                 android:id="@+id/activity_pace"
                 style="@style/RunInfo"
+                android:layout_marginEnd="3dp"
                 android:layout_marginRight="3dp" />
         </LinearLayout>
     </LinearLayout>
@@ -131,11 +127,10 @@
                         android:id="@+id/notes_text"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:gravity="top|left"
+                        android:gravity="top|start"
                         android:inputType="textCapSentences|textMultiLine"
                         android:minLines="4"
-                        android:hint="@string/Notes_about_your_workout"
-                        android:singleLine="false" />
+                        android:hint="@string/Notes_about_your_workout" />
 
                     <LinearLayout
                         android:id="@+id/hrzonesBarLayout"
@@ -143,7 +138,7 @@
                         android:layout_height="match_parent"
                         android:orientation="vertical"
                         android:visibility="gone"
-                        android:background="@color/black">
+                        android:background="@android:color/black">
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -157,7 +152,8 @@
                 <LinearLayout
                     android:id="@+id/tab_lap"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent" >
+                    android:layout_height="match_parent"
+                    android:baselineAligned="false">
 
                     <ListView
                         android:id="@+id/laplist"
@@ -170,7 +166,8 @@
                 <LinearLayout
                     android:id="@+id/tab_upload"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent" >
+                    android:layout_height="match_parent"
+                    android:baselineAligned="false">
 
                     <ListView
                         android:id="@+id/report_list"
@@ -209,9 +206,9 @@
             style="@style/ButtonText"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_above="@+id/save_button"
             android:background="@drawable/btn_blue"
             android:text="@string/Resume"
+            android:drawableEnd="@drawable/ic_av_play_arrow"
             android:drawableRight="@drawable/ic_av_play_arrow"
             android:drawablePadding="-32dp" />
 
@@ -220,17 +217,14 @@
             android:id="@+id/upload_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_above="@+id/save_button"
             android:background="@drawable/btn_blue"
-            android:text="@string/Upload_activity"
-            android:singleLine="false" />
+            android:text="@string/Upload_activity" />
 
         <Button
             android:id="@+id/save_button"
             style="@style/ButtonText"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_above="@+id/discard_button"
             android:background="@drawable/btn_green"
             android:text="@string/Save_activity" />
 
@@ -239,7 +233,6 @@
             style="@style/ButtonText"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
             android:background="@drawable/btn_red"
             android:text="@string/Discard_activity" />
     </LinearLayout>
diff --git a/app/res/layout/feed.xml b/app/res/layout/feed.xml
index 9eb3d2ad0..8902b38df 100644
--- a/app/res/layout/feed.xml
+++ b/app/res/layout/feed.xml
@@ -16,7 +16,6 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tab1_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" >
@@ -32,10 +31,10 @@
             android:id="@+id/feed_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
             android:layout_marginRight="10dp" />
 
         <ProgressBar
-            android:id="@+id/feed_progress_bar"
             style="?android:attr/progressBarStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
diff --git a/app/res/layout/feed_row_activity.xml b/app/res/layout/feed_row_activity.xml
index 1896b7902..756081101 100644
--- a/app/res/layout/feed_row_activity.xml
+++ b/app/res/layout/feed_row_activity.xml
@@ -18,14 +18,16 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_margin="10dp"
-    android:orientation="horizontal" >
+    android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/feed_image"
         android:layout_width="96dp"
         android:layout_height="96dp"
-        android:layout_margin="2dp" />
+        android:layout_margin="2dp"
+        tools:ignore="ContentDescription" />
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/app/res/layout/feed_row_date_header.xml b/app/res/layout/feed_row_date_header.xml
index 25d7b6c70..92140353b 100644
--- a/app/res/layout/feed_row_date_header.xml
+++ b/app/res/layout/feed_row_date_header.xml
@@ -25,6 +25,7 @@
         android:id="@+id/feed_activity_date_header"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
         android:layout_marginLeft="10dp"
         style="@style/FeedDateHeader"
         />
diff --git a/app/res/layout/filepermission.xml b/app/res/layout/filepermission.xml
index e02e86865..179a35595 100644
--- a/app/res/layout/filepermission.xml
+++ b/app/res/layout/filepermission.xml
@@ -17,7 +17,6 @@
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/linear1_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" >
@@ -29,18 +28,12 @@
         android:id="@+id/textViewAuthNotice"
         android:layout_marginBottom="10dp" />
 
-    <TableLayout
-        android:id="@+id/table_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" >
-
         <TableRow
             android:id="@+id/table_row1"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content" >
 
             <TextView
-                android:id="@+id/text_view1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="URL"
@@ -54,10 +47,7 @@
                 android:inputType="textUri" />
 
         </TableRow>
-
-    </TableLayout>
     <TableRow
-        android:id="@+id/table_row3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" >
 
diff --git a/app/res/layout/heartratezonerow.xml b/app/res/layout/heartratezonerow.xml
index afc22e02e..a8bd75702 100644
--- a/app/res/layout/heartratezonerow.xml
+++ b/app/res/layout/heartratezonerow.xml
@@ -16,7 +16,6 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <TableRow xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/zone1_row"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content" >
 
@@ -26,7 +25,6 @@
         android:layout_height="wrap_content" />
 
     <TextView
-        android:id="@+id/zonefiller1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="invisible" />
@@ -39,7 +37,6 @@
         android:inputType="number" />
 
     <TextView
-        android:id="@+id/zonefiller2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="invisible" />
@@ -52,7 +49,6 @@
 		android:inputType="number" />
 
     <TextView
-        android:id="@+id/zonefiller3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="invisible" />
diff --git a/app/res/layout/heartratezones.xml b/app/res/layout/heartratezones.xml
index 8dc5e4c16..d372c013f 100644
--- a/app/res/layout/heartratezones.xml
+++ b/app/res/layout/heartratezones.xml
@@ -16,7 +16,6 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/linear1xx_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" xmlns:app="http://schemas.android.com/apk/res-auto">
diff --git a/app/res/layout/history.xml b/app/res/layout/history.xml
index a43de62c9..ae3248be2 100644
--- a/app/res/layout/history.xml
+++ b/app/res/layout/history.xml
@@ -16,7 +16,6 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tab1_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" >
@@ -25,6 +24,7 @@
         android:id="@+id/history_list"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
+        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true" >
     </ListView>
diff --git a/app/res/layout/history_row.xml b/app/res/layout/history_row.xml
index b71547897..9f9d31d6a 100644
--- a/app/res/layout/history_row.xml
+++ b/app/res/layout/history_row.xml
@@ -21,7 +21,6 @@
     android:orientation="vertical" >
 
     <RelativeLayout
-        android:id="@+id/history_row0"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal" >
@@ -30,6 +29,7 @@
             android:id="@+id/history_list_start_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
             android:layout_alignParentLeft="true"
             android:text=""
             android:textSize="20sp"
@@ -39,7 +39,10 @@
             android:id="@+id/history_list_sport"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
+            android:layout_toEndOf="@+id/history_list_start_time"
+            android:layout_toRightOf="@+id/history_list_start_time"
             android:textSize="20sp"
             android:textStyle="bold" />
 
@@ -55,7 +58,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:gravity="right"
+            android:gravity="end"
             android:text="@string/time"
             android:textSize="20sp" />
 
@@ -64,7 +67,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:gravity="right"
+            android:gravity="end"
             android:text="@string/distance"
             android:textSize="20sp" />
 
@@ -73,7 +76,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:gravity="right"
+            android:gravity="end"
             android:text="@string/pace"
             android:textSize="20sp" />
 
diff --git a/app/res/layout/hr_settings.xml b/app/res/layout/hr_settings.xml
index 0c1c0664f..e51807773 100644
--- a/app/res/layout/hr_settings.xml
+++ b/app/res/layout/hr_settings.xml
@@ -12,17 +12,17 @@
         android:orientation="horizontal" >
 
         <TextView
-            android:id="@+id/total_time"
             style="@style/RunHeader"
+            android:layout_marginStart="5dp"
             android:layout_marginLeft="5dp"
-            android:gravity="left"
+            android:gravity="start"
             android:text="@string/Device" />
 
         <TextView
-            android:id="@+id/total_pace"
             style="@style/RunHeader"
+            android:layout_marginEnd="3dp"
             android:layout_marginRight="3dp"
-            android:gravity="right"
+            android:gravity="end"
             android:text="@string/Heart_rate" />
     </LinearLayout>
 
@@ -35,18 +35,15 @@
         android:orientation="vertical" >
 
         <LinearLayout
-            android:id="@+id/header"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
             android:layout_marginLeft="10dp" >
 
-            <TextView
-                android:id="@+id/text_view01"
-                style="@style/RunHeader" />
+            <TextView style="@style/RunHeader" />
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/linear_layout3"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal" >
@@ -54,19 +51,20 @@
             <TextView
                 android:id="@+id/hr_device"
                 style="@style/RunInfo"
+                android:layout_marginStart="5dp"
                 android:layout_marginLeft="5dp"
-                android:gravity="left" />
+                android:gravity="start" />
 
             <TextView
                 android:id="@+id/hr_value"
                 style="@style/RunInfo"
+                android:layout_marginEnd="3dp"
                 android:layout_marginRight="3dp"
                 android:text="" />
         </LinearLayout>
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/aallaa"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="fill_parent"
diff --git a/app/res/layout/laplist_row.xml b/app/res/layout/laplist_row.xml
index e047ec697..7b1119ee4 100644
--- a/app/res/layout/laplist_row.xml
+++ b/app/res/layout/laplist_row.xml
@@ -32,7 +32,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="0.8"
-        android:gravity="right"
+        android:gravity="end"
         android:text=""
         android:textStyle="" />
 
@@ -41,7 +41,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:gravity="right"
+        android:gravity="end"
         android:text="@string/time" />
 
     <TextView
@@ -49,7 +49,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:gravity="right"
+        android:gravity="end"
         android:text="@string/distance" />
 
     <TextView
@@ -57,14 +57,14 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:gravity="right"
+        android:gravity="end"
         android:text="@string/pace" />
     <TextView
         android:id="@+id/lap_list_hr"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:gravity="right"
+        android:gravity="end"
         android:text="@string/metrics_heartrate" />
 
 </LinearLayout>
diff --git a/app/res/layout/manage_workouts.xml b/app/res/layout/manage_workouts.xml
index df11a3835..71e38f66e 100644
--- a/app/res/layout/manage_workouts.xml
+++ b/app/res/layout/manage_workouts.xml
@@ -16,7 +16,6 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/relative_layout1"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
diff --git a/app/res/layout/manage_workouts_list_row.xml b/app/res/layout/manage_workouts_list_row.xml
index 60386a137..648481be6 100644
--- a/app/res/layout/manage_workouts_list_row.xml
+++ b/app/res/layout/manage_workouts_list_row.xml
@@ -19,7 +19,10 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:paddingLeft="20dp" >
+    android:paddingStart="20dp"
+    android:paddingLeft="20dp"
+    android:paddingEnd="20dp"
+    android:paddingRight="20dp" >
 
     <RadioButton
         android:id="@+id/download_workout_checkbox"
diff --git a/app/res/layout/run.xml b/app/res/layout/run.xml
index 8220caf14..ccbd5ea3e 100644
--- a/app/res/layout/run.xml
+++ b/app/res/layout/run.xml
@@ -16,7 +16,6 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tab1_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" >
@@ -32,27 +31,25 @@
             android:layout_height="wrap_content" >
 
             <TextView
-                android:id="@+id/activity_header_time"
                 style="@style/RunHeader"
-                android:gravity="right"
+                android:gravity="end"
                 android:text="@string/time" />
 
             <TextView
-                android:id="@+id/activity_header_distance"
                 style="@style/RunHeader"
-                android:gravity="right"
+                android:gravity="end"
                 android:text="@string/distance" />
 
             <TextView
-                android:id="@+id/activity_header_pace"
                 style="@style/RunHeader"
-                android:gravity="right"
+                android:gravity="end"
                 android:text="@string/pace" />
             <TextView
                 android:id="@+id/activity_header_hr"
                 style="@style/RunHeader"
+                android:layout_marginEnd="3dp"
                 android:layout_marginRight="3dp"
-                android:gravity="right"
+                android:gravity="end"
                 android:text="@string/metrics_heartrate" />
         </TableRow>
 
@@ -68,6 +65,7 @@
 
                 <TextView
                     style="@style/RunHeader"
+                    android:layout_marginStart="10dp"
                     android:layout_marginLeft="10dp"
                     android:text="@string/Total" />
             </LinearLayout>
@@ -90,6 +88,7 @@
                 <TextView
                     android:id="@+id/activity_hr"
                     style="@style/RunInfo"
+                    android:layout_marginEnd="3dp"
                     android:layout_marginRight="3dp" />
             </TableRow>
         </LinearLayout>
@@ -107,12 +106,12 @@
 
                 <TextView
                     style="@style/RunHeader"
+                    android:layout_marginStart="10dp"
                     android:layout_marginLeft="10dp"
                     android:text="@string/Interval" />
             </LinearLayout>
 
             <TableRow
-                android:id="@+id/table_row_interval0"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content" >
 
@@ -130,6 +129,7 @@
                 <TextView
                     android:id="@+id/interval_hr"
                     style="@style/RunInfo"
+                    android:layout_marginEnd="3dp"
                     android:layout_marginRight="3dp" />
             </TableRow>
         </LinearLayout>
@@ -146,6 +146,7 @@
 
                 <TextView
                     style="@style/RunHeader"
+                    android:layout_marginStart="10dp"
                     android:layout_marginLeft="10dp"
                     android:text="@string/Lap" />
             </LinearLayout>
@@ -153,7 +154,7 @@
             <TableRow
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="right" >
+                android:layout_gravity="end" >
 
                 <TextView
                     android:id="@+id/lap_time"
@@ -169,6 +170,7 @@
                 <TextView
                     android:id="@+id/lap_hr"
                     style="@style/RunInfo"
+                    android:layout_marginEnd="3dp"
                     android:layout_marginRight="3dp" />
             </TableRow>
         </LinearLayout>
@@ -218,6 +220,7 @@
             android:layout_weight="1"
             android:background="@drawable/btn_blue"
             android:text="@string/New_lap"
+            android:drawableEnd="@drawable/ic_av_newlap"
             android:drawableRight="@drawable/ic_av_newlap"
             android:drawablePadding="-32dp" />
 
@@ -229,6 +232,7 @@
             android:layout_weight="1"
             android:background="@drawable/btn_blue"
             android:text="@string/Pause"
+            android:drawableEnd="@drawable/ic_av_pause"
             android:drawableRight="@drawable/ic_av_pause"
             android:drawablePadding="-32dp" />
     </TableRow>
@@ -247,6 +251,7 @@
             android:layout_weight="1"
             android:background="@drawable/btn_red"
             android:text="@string/Stop"
+            android:drawableEnd="@drawable/ic_av_stop"
             android:drawableRight="@drawable/ic_av_stop"
             android:drawablePadding="-32dp" />
     </TableRow>
diff --git a/app/res/layout/settings_wrapper.xml b/app/res/layout/settings_wrapper.xml
index 6e184c405..95ab58561 100644
--- a/app/res/layout/settings_wrapper.xml
+++ b/app/res/layout/settings_wrapper.xml
@@ -16,7 +16,6 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/relative_layout1"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
@@ -25,6 +24,7 @@
         android:id="@+id/settings_spinner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:visibility="gone" 
@@ -34,6 +34,7 @@
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="fill_parent"
+        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/settings_spinner" >
 
diff --git a/app/res/layout/start.xml b/app/res/layout/start.xml
index 30d79a245..9d02e456c 100644
--- a/app/res/layout/start.xml
+++ b/app/res/layout/start.xml
@@ -17,7 +17,6 @@
   -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/tab1_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
@@ -71,17 +70,20 @@
         android:id="@+id/gps_info1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_toEndOf="@+id/gps_info_text"
         android:layout_toRightOf="@+id/gps_info_text" />
 
     <TextView
         android:id="@+id/gps_info2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_toEndOf="@+id/gps_info1"
         android:layout_toRightOf="@+id/gps_info1" />
     <TextView
         android:id="@+id/hr_info"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:layout_toEndOf="@+id/gps_info2"
         android:layout_toRightOf="@+id/gps_info2"
         android:gravity="center" />
     </RelativeLayout>
@@ -102,6 +104,7 @@
             android:enabled="true"
             android:text="@string/Start_GPS"
             android:layout_weight="0.8"
+            android:drawableEnd="@drawable/ic_av_play_arrow"
             android:drawableRight="@drawable/ic_av_play_arrow"
             android:drawablePadding="-32dp" />
 
@@ -117,7 +120,8 @@
                 android:layout_height="match_parent"
                 android:background="@android:color/transparent"
                 android:scaleType="fitCenter"
-                android:src="@drawable/heart" />
+                android:src="@drawable/heart"
+                tools:ignore="ContentDescription"/>
 
             <TextView
                 android:id="@+id/hr_value_text"
@@ -140,7 +144,8 @@
                 android:layout_height="match_parent"
                 android:background="@android:color/transparent"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_wear"/>
+                android:src="@drawable/ic_wear"
+                tools:ignore="ContentDescription"/>
 
             <TextView
                 android:id="@+id/wear_value_text"
diff --git a/app/res/layout/start_advanced.xml b/app/res/layout/start_advanced.xml
index 6c9d08c27..a04b6f465 100644
--- a/app/res/layout/start_advanced.xml
+++ b/app/res/layout/start_advanced.xml
@@ -26,6 +26,7 @@
         android:id="@+id/advanced_audio_cue_spinner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:key="@string/pref_advanced_audio"
@@ -37,6 +38,7 @@
         android:id="@+id/advanced_workout_spinner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/advanced_audio_cue_spinner"
         android:key="@string/pref_advanced_workout"
diff --git a/app/res/layout/start_basic.xml b/app/res/layout/start_basic.xml
index e26ef7205..98e0be617 100644
--- a/app/res/layout/start_basic.xml
+++ b/app/res/layout/start_basic.xml
@@ -31,7 +31,6 @@
 		runnerup:type="spinner_txt"/>
     
     <org.runnerup.widget.TitleSpinner
-        android:id="@+id/basic_sport"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:entries="@array/sportEntries"
diff --git a/app/res/layout/start_interval.xml b/app/res/layout/start_interval.xml
index f4710f414..4647a3ac1 100644
--- a/app/res/layout/start_interval.xml
+++ b/app/res/layout/start_interval.xml
@@ -22,7 +22,6 @@
     android:layout_height="match_parent">
 
     <LinearLayout
-        android:id="@+id/tab_interval0"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical" >
@@ -114,7 +113,6 @@
             android:orientation="horizontal" >
 
             <CheckBox
-                android:id="@+id/interval_warmup"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -123,7 +121,6 @@
                 android:text="@string/warm_up" />
 
             <CheckBox
-                android:id="@+id/interval_cooldown"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
diff --git a/app/res/layout/start_manual.xml b/app/res/layout/start_manual.xml
index 0a4e64f3c..4a92deefd 100644
--- a/app/res/layout/start_manual.xml
+++ b/app/res/layout/start_manual.xml
@@ -26,6 +26,7 @@
         android:id="@+id/manual_sport"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:entries="@array/sportEntries"
@@ -46,6 +47,7 @@
         android:id="@+id/manual_time"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/manual_date"
         android:prompt="@string/Type"
@@ -57,6 +59,7 @@
         android:id="@+id/manual_duration"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/manual_time"
         android:prompt="@string/Type"
@@ -68,17 +71,20 @@
         android:id="@+id/manual_distance"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/manual_duration"
         android:prompt="@string/Type"
         android:inputType="numberDecimal"
         android:text="@string/Distance"
+        android:defaultValue="0"
         runnerup:type="distancepicker" />
 
     <org.runnerup.widget.TitleSpinner
         android:id="@+id/manual_pace"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/manual_distance"
         android:prompt="@string/Type"
@@ -90,13 +96,13 @@
         android:id="@+id/manual_notes"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/manual_pace"
         android:layout_alignParentBottom="true"
         android:ems="10"
-        android:gravity="top|left"
+        android:gravity="top|start"
         android:inputType="textMultiLine"
-        android:singleLine="false"
         android:hint="@string/Add_workout_notes" />
 
 </RelativeLayout>
diff --git a/app/res/layout/step_button.xml b/app/res/layout/step_button.xml
index f1ba076cf..64901376f 100644
--- a/app/res/layout/step_button.xml
+++ b/app/res/layout/step_button.xml
@@ -22,11 +22,11 @@
     android:layout_height="wrap_content"
     android:background="@drawable/title_spinner"
     android:clickable="true"
+    android:focusable="true"
     android:gravity="center_vertical"
     >
 
     <TableRow
-        android:id="@+id/step_row0"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical|fill_horizontal"
@@ -38,7 +38,7 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:layout_weight="27"
-            android:gravity="center_vertical|left"
+            android:gravity="center_vertical|start"
             android:text="@string/cool_down"
             android:textColor="@android:color/black"
             android:textStyle="bold" />
@@ -48,7 +48,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="25"
-            android:gravity="center_vertical|left"
+            android:gravity="center_vertical|start"
             android:text="@string/Duration"
             android:textColor="@android:color/black" />
 
@@ -57,7 +57,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="50"
-            android:gravity="center_vertical|right"
+            android:gravity="center_vertical|end"
             android:textColor="@android:color/black" />
     </TableRow>
 
@@ -71,11 +71,10 @@
         tools:ignore="HardcodedText" >
 
         <TextView
-            android:id="@+id/text_view03"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="27"
-            android:gravity="center_vertical|left"
+            android:gravity="center_vertical|start"
             android:textColor="@android:color/black"
             android:textStyle="bold"
             android:visibility="invisible" />
@@ -85,7 +84,7 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:layout_weight="25"
-            android:gravity="center_vertical|left"
+            android:gravity="center_vertical|start"
             android:text="@string/pace"
             android:textColor="@android:color/black" />
 
@@ -94,7 +93,7 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:layout_weight="50"
-            android:gravity="center_vertical|right"
+            android:gravity="center_vertical|end"
             android:textColor="@android:color/black" />
     </TableRow>
 </TableLayout>
\ No newline at end of file
diff --git a/app/res/layout/step_dialog.xml b/app/res/layout/step_dialog.xml
index 58450d6ab..c4aa8eba0 100644
--- a/app/res/layout/step_dialog.xml
+++ b/app/res/layout/step_dialog.xml
@@ -18,12 +18,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:runnerup="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:id="@+id/tab_interval0"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    android:layout_height="match_parent"
         android:orientation="vertical" >
 
         <org.runnerup.widget.TitleSpinner
@@ -102,6 +97,4 @@
             android:prompt="@string/Type"
             android:text="@string/heart_rate_zone" />
 
-    </LinearLayout>
-
 </LinearLayout>
diff --git a/app/res/layout/title_spinner.xml b/app/res/layout/title_spinner.xml
index 01111daf0..5e547fc65 100644
--- a/app/res/layout/title_spinner.xml
+++ b/app/res/layout/title_spinner.xml
@@ -16,11 +16,13 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/title_spinner"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="@drawable/title_spinner"
     android:clickable="true"
+    android:focusable="true"
     android:gravity="center_vertical"
     android:orientation="horizontal" >
 
@@ -30,7 +32,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:gravity="center_vertical|left"
+        android:gravity="center_vertical|start"
         android:textColor="@android:color/black"
         android:textStyle="bold" />
 
@@ -40,7 +42,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:gravity="center_vertical|right"
+        android:gravity="center_vertical|end"
         android:text="@string/value"
         android:textColor="@android:color/black" />
 
@@ -48,5 +50,6 @@
         android:id="@+id/spinner"
         android:spinnerMode="dialog"
         android:layout_width="0dp"
-        android:layout_height="0dp" />
+        android:layout_height="0dp"
+        tools:ignore="UnusedAttribute" />
 </LinearLayout>
diff --git a/app/res/layout/upload.xml b/app/res/layout/upload.xml
index b3633821b..f9a583766 100644
--- a/app/res/layout/upload.xml
+++ b/app/res/layout/upload.xml
@@ -15,12 +15,11 @@
   ~  You should have received a copy of the GNU General Public License
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<RelativeLayout
-  android:id="@+id/tab1_layout"
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
-  android:orientation="vertical">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
 
   <LinearLayout
     android:id="@+id/name"
@@ -33,16 +32,15 @@
       android:id="@+id/account_upload_list_name"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_alignParentTop="true"
+      android:layout_marginStart="200dp"
       android:layout_marginLeft="200dp"/>
 
     <ImageView
       android:id="@+id/account_upload_list_icon"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_alignParentTop="true"
-      android:layout_toRightOf="@+id/account_upload_list_name"
-      android:scaleType="center"/>
+      android:scaleType="center"
+      tools:ignore="ContentDescription"/>
   </LinearLayout>
 
   <ListView
@@ -50,6 +48,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:layout_above="@+id/account_upload_buttons"
+    android:layout_alignParentStart="true"
     android:layout_alignParentLeft="true"
     android:layout_below="@+id/name"
     android:scrollbarAlwaysDrawVerticalTrack="true">
@@ -70,14 +69,16 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_weight="1"
-      android:text="@string/Select_all"/>
+      android:text="@string/Select_all"
+        tools:ignore="ButtonStyle" />
 
     <Button
       android:id="@+id/account_upload_clear_all"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_weight="1"
-      android:text="@string/Clear_all"/>
+      android:text="@string/Clear_all"
+        tools:ignore="ButtonStyle" />
   </LinearLayout>
 
   <LinearLayout
@@ -95,10 +96,7 @@
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
       android:background="@drawable/btn_blue"
-      android:text="@string/upload"
-      android:layout_above="@+id/account_download_button"
-      android:layout_alignParentRight="true"
-      android:layout_alignParentEnd="true"/>
+      android:text="@string/upload" />
 
     <Button
       android:id="@+id/account_download_button"
@@ -106,10 +104,7 @@
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
       android:background="@drawable/btn_blue"
-      android:text="@string/Download"
-      android:layout_alignParentBottom="true"
-      android:layout_alignParentRight="true"
-      android:layout_alignParentEnd="true"/>
+      android:text="@string/Download" />
   </LinearLayout>
 
 </RelativeLayout>
diff --git a/app/res/layout/upload_row.xml b/app/res/layout/upload_row.xml
index cc3a581cf..50797f684 100644
--- a/app/res/layout/upload_row.xml
+++ b/app/res/layout/upload_row.xml
@@ -21,7 +21,6 @@
     android:orientation="vertical" >
 
     <RelativeLayout
-        android:id="@+id/upload_row0"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal" >
@@ -30,6 +29,7 @@
             android:id="@+id/upload_list_start_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true" />
 
@@ -38,13 +38,17 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
+            android:layout_toEndOf="@+id/upload_list_start_time"
+            android:layout_toRightOf="@+id/upload_list_start_time"
+            android:layout_toStartOf="@+id/upload_list_check"
             android:layout_toLeftOf="@+id/upload_list_check" />
-        
+
         <CheckBox
             android:id="@+id/upload_list_check"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true" />
         
     </RelativeLayout>
@@ -60,7 +64,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:gravity="right"
+            android:gravity="end"
             android:text="@string/time" />
 
         <TextView
@@ -68,7 +72,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:gravity="right"
+            android:gravity="end"
             android:text="@string/distance" />
 
         <TextView
@@ -76,7 +80,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:gravity="right"
+            android:gravity="end"
             android:text="@string/pace" />
     </LinearLayout>
 
diff --git a/app/res/layout/userpass.xml b/app/res/layout/userpass.xml
index 48de2f397..e7723d797 100644
--- a/app/res/layout/userpass.xml
+++ b/app/res/layout/userpass.xml
@@ -16,7 +16,6 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/linear1_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" >
@@ -29,7 +28,6 @@
         android:layout_marginBottom="10dp" />
 
     <TableLayout
-        android:id="@+id/table_layout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" >
 
@@ -39,7 +37,6 @@
             android:layout_height="wrap_content" >
 
             <TextView
-                android:id="@+id/text_view_url"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/Website" />
@@ -49,7 +46,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:inputType="textEmailAddress" />
+                android:inputType="textUri" />
 
         </TableRow>
 
@@ -59,7 +56,6 @@
             android:layout_height="wrap_content" >
 
             <TextView
-                android:id="@+id/text_view1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/Username" />
@@ -79,7 +75,6 @@
             android:layout_height="wrap_content" >
 
             <TextView
-                android:id="@+id/text_view01"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/Password" />
@@ -95,7 +90,6 @@
     </TableLayout>
 
     <TableRow
-        android:id="@+id/table_row3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" >
 
diff --git a/app/res/layout/whatsnew.xml b/app/res/layout/whatsnew.xml
index 9deb33094..04df962bd 100644
--- a/app/res/layout/whatsnew.xml
+++ b/app/res/layout/whatsnew.xml
@@ -16,7 +16,6 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tab1_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" >
diff --git a/app/res/layout/workout_row.xml b/app/res/layout/workout_row.xml
index 03016c9d0..2641bb3d5 100644
--- a/app/res/layout/workout_row.xml
+++ b/app/res/layout/workout_row.xml
@@ -18,11 +18,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-	<LinearLayout
-    	android:layout_width="fill_parent"
-    	android:layout_height="wrap_content"
     	android:orientation="horizontal" >
     
     	<TextView
@@ -30,7 +25,7 @@
     	    android:layout_height="wrap_content"
     	    android:layout_weight="1"
     	    android:layout_width="0dp"
-    	    android:gravity="left"
+    	    android:gravity="start"
     	    android:text="@string/intensity" />
 
     	<TextView
@@ -38,7 +33,7 @@
     	    android:layout_width="0dp"
     	    android:layout_height="wrap_content"
     	    android:layout_weight="1"
-    	    android:gravity="left"
+    	    android:gravity="start"
     	    android:text="@string/distance" />
 
 	    <TextView
@@ -46,14 +41,13 @@
 	        android:layout_width="0dp"
 	        android:layout_height="wrap_content"
 	        android:layout_weight="1"
-	        android:gravity="left" />
+	        android:gravity="start" />
 
 	    <TextView
 	        android:id="@+id/step_pace"
 	        android:layout_height="wrap_content"
 	        android:layout_weight="1"
     	    android:layout_width="0dp"
-    	    android:gravity="left" />
+    	    android:gravity="start" />
 
-	</LinearLayout>
 </LinearLayout>
diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml
index 6be73a964..f46d8f597 100644
--- a/app/res/values/colors.xml
+++ b/app/res/values/colors.xml
@@ -16,5 +16,4 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
-     <color name="black">#000</color>
 </resources>
diff --git a/app/res/values/mapbox.xml b/app/res/values/mapbox.xml
index de1b86048..61b1f6dc7 100644
--- a/app/res/values/mapbox.xml
+++ b/app/res/values/mapbox.xml
@@ -16,7 +16,6 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="mapboxMapID">cqnqrd.4004d33f</string>
     <string name="mapboxAccessToken">pk.eyJ1IjoiY3FucXJkIiwiYSI6ImJmYjcxNDkyZjJiNzllMzYxYjA0NjA1YTI0Mzg4ODA4In0.N9lbcSp06JqIpFSP5X44Fw</string>
     <string name="mapboxDefaultStyle">mapbox://styles/mapbox/outdoors-v9</string>
 </resources>
diff --git a/app/res/layout/laplist.xml b/app/res/values/number_picker.xml
similarity index 60%
rename from app/res/layout/laplist.xml
rename to app/res/values/number_picker.xml
index 55eacf4d3..61c20b9bc 100644
--- a/app/res/layout/laplist.xml
+++ b/app/res/values/number_picker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2012 jonas.oreland@gmail.com
+  ~ Copyright (C) 2013 jonas.oreland@gmail.com
   ~
   ~  This program is free software: you can redistribute it and/or modify
   ~  it under the terms of the GNU General Public License as published by
@@ -15,8 +15,16 @@
   ~  You should have received a copy of the GNU General Public License
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-</ListView>
\ No newline at end of file
+<resources>
+<declare-styleable name="NumberPicker">
+	<attr name="digits" format="string" />
+	<attr name="min_val" format="string" />
+	<attr name="max_val" format="string" />
+	<attr name="android:text" />
+    <attr name="android:prompt" />
+    <attr name="android:entries" />
+    <attr name="android:inputType" />
+    <attr name="android:defaultValue" />
+    <attr name="android:key" />
+</declare-styleable>    
+</resources>
\ No newline at end of file
diff --git a/app/res/values/title_spinner.xml b/app/res/values/title_spinner.xml
index c989d02eb..241866378 100644
--- a/app/res/values/title_spinner.xml
+++ b/app/res/values/title_spinner.xml
@@ -18,11 +18,7 @@
 <resources>
 <declare-styleable name="TitleSpinner">
 	<attr name="type" format="string" />
-	<attr name="digits" format="string" />
-	<attr name="min_val" format="string" />
-	<attr name="max_val" format="string" />
 	<attr name="android:text" />
-    <attr name="android:prompt" />
     <attr name="android:entries" />
     <attr name="values" format="reference"/>
     <attr name="android:inputType" />
diff --git a/app/res/xml-v14/feed_widget_provider_info.xml b/app/res/xml-v14/feed_widget_provider_info.xml
index 8a3f9a746..2f5c98f03 100644
--- a/app/res/xml-v14/feed_widget_provider_info.xml
+++ b/app/res/xml-v14/feed_widget_provider_info.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="UnusedAttribute"
     android:initialLayout="@layout/feed_widget"
     android:minWidth="120dp"
     android:minHeight="40dp"
diff --git a/app/res/xml/backup_descriptor.xml b/app/res/xml/backup_descriptor.xml
new file mode 100644
index 000000000..a608293f2
--- /dev/null
+++ b/app/res/xml/backup_descriptor.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+</full-backup-content>
diff --git a/app/src/org/runnerup/content/ActivityProvider.java b/app/src/org/runnerup/content/ActivityProvider.java
index f72141eee..4a7faf783 100644
--- a/app/src/org/runnerup/content/ActivityProvider.java
+++ b/app/src/org/runnerup/content/ActivityProvider.java
@@ -17,7 +17,6 @@
 
 package org.runnerup.content;
 
-import android.annotation.TargetApi;
 import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.content.Context;
@@ -26,7 +25,6 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
-import android.os.Build;
 import android.os.ParcelFileDescriptor;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
@@ -51,7 +49,7 @@
 import java.io.OutputStreamWriter;
 import java.util.List;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class ActivityProvider extends ContentProvider {
 
     // The authority is the symbolic name for the provider class
diff --git a/app/src/org/runnerup/content/WorkoutFileProvider.java b/app/src/org/runnerup/content/WorkoutFileProvider.java
index 544b23b9a..a72101c5a 100644
--- a/app/src/org/runnerup/content/WorkoutFileProvider.java
+++ b/app/src/org/runnerup/content/WorkoutFileProvider.java
@@ -17,21 +17,20 @@
 
 package org.runnerup.content;
 
-import android.annotation.TargetApi;
 import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.content.UriMatcher;
 import android.database.Cursor;
 import android.net.Uri;
-import android.os.Build;
 import android.os.ParcelFileDescriptor;
+import android.support.annotation.NonNull;
 
 import org.runnerup.workout.WorkoutSerializer;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class WorkoutFileProvider extends ContentProvider {
 
     // The authority is the symbolic name for the provider class
@@ -54,7 +53,7 @@ public boolean onCreate() {
     }
 
     @Override
-    public ParcelFileDescriptor openFile(Uri uri, String mode)
+    public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode)
             throws FileNotFoundException {
 
         // Check incoming Uri against the matcher
@@ -73,9 +72,8 @@ public ParcelFileDescriptor openFile(Uri uri, String mode)
                 // Note: I don't care what mode they ask for - they're only
                 // getting
                 // read only
-                ParcelFileDescriptor pfd = ParcelFileDescriptor.open(file,
+                return ParcelFileDescriptor.open(file,
                         ParcelFileDescriptor.MODE_READ_ONLY);
-                return pfd;
 
                 // Otherwise unrecognised Uri
             default:
@@ -89,23 +87,23 @@ public ParcelFileDescriptor openFile(Uri uri, String mode)
     // //////////////////////////////////////////////////////////////
 
     @Override
-    public int update(Uri uri, ContentValues contentvalues, String s,
-            String[] as) {
+    public int update(@NonNull Uri uri, ContentValues contentvalues, String s,
+                      String[] as) {
         return 0;
     }
 
     @Override
-    public int delete(Uri uri, String s, String[] as) {
+    public int delete(@NonNull Uri uri, String s, String[] as) {
         return 0;
     }
 
     @Override
-    public Uri insert(Uri uri, ContentValues contentvalues) {
+    public Uri insert(@NonNull Uri uri, ContentValues contentvalues) {
         return null;
     }
 
     @Override
-    public String getType(Uri uri) {
+    public String getType(@NonNull Uri uri) {
         if (uriMatcher.match(uri) == 1) {
             return MIME;
         }
@@ -113,8 +111,8 @@ public String getType(Uri uri) {
     }
 
     @Override
-    public Cursor query(Uri uri, String[] projection, String s, String[] as1,
-            String s1) {
+    public Cursor query(@NonNull Uri uri, String[] projection, String s, String[] as1,
+                        String s1) {
         return null;
     }
 }
diff --git a/app/src/org/runnerup/db/ActivityCleaner.java b/app/src/org/runnerup/db/ActivityCleaner.java
index 3716624a5..56f0ded42 100644
--- a/app/src/org/runnerup/db/ActivityCleaner.java
+++ b/app/src/org/runnerup/db/ActivityCleaner.java
@@ -17,23 +17,21 @@
 
 package org.runnerup.db;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.location.Location;
-import android.os.Build;
 import android.util.Log;
 
 import org.runnerup.common.util.Constants;
 
 import java.util.ArrayList;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class ActivityCleaner implements Constants {
-    long _totalSumHr = 0;
-    int _totalCount = 0;
-    int _totalMaxHr = 0;
+    private long _totalSumHr = 0;
+    private int _totalCount = 0;
+    private int _totalMaxHr = 0;
 
     /**
      * recompute laps aggregates based on locations
@@ -43,7 +41,7 @@ private void recomputeLaps(SQLiteDatabase db, long activityId) {
                 DB.LAP.LAP
         };
 
-        ArrayList<Long> laps = new ArrayList<Long>();
+        ArrayList<Long> laps = new ArrayList<>();
         Cursor c = db.query(DB.LAP.TABLE, cols, DB.LAP.ACTIVITY + " = " + activityId,
                 null, null, null, "_id", null);
         if (c.moveToFirst()) {
@@ -191,7 +189,7 @@ public static void trim(SQLiteDatabase db, long activityId) {
             DB.LAP.LAP
         };
 
-        ArrayList<Long> laps = new ArrayList<Long>();
+        ArrayList<Long> laps = new ArrayList<>();
         Cursor c = db.query(DB.LOCATION.LAP, cols, DB.LAP.ACTIVITY + " = "
                 + activityId, null, null, null, "_id", null);
         if (c.moveToFirst()) {
diff --git a/app/src/org/runnerup/db/DBHelper.java b/app/src/org/runnerup/db/DBHelper.java
index b83b6dee2..51386d2dd 100644
--- a/app/src/org/runnerup/db/DBHelper.java
+++ b/app/src/org/runnerup/db/DBHelper.java
@@ -17,7 +17,7 @@
 
 package org.runnerup.db;
 
-import android.annotation.TargetApi;
+import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.ContentValues;
@@ -27,8 +27,6 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Environment;
 import android.util.Log;
 
 import org.runnerup.R;
@@ -41,7 +39,6 @@
 import org.runnerup.export.FunBeatSynchronizer;
 import org.runnerup.export.GarminSynchronizer;
 import org.runnerup.export.GoogleFitSynchronizer;
-import org.runnerup.export.GooglePlusSynchronizer;
 import org.runnerup.export.JoggSESynchronizer;
 import org.runnerup.export.MapMyRunSynchronizer;
 import org.runnerup.export.NikePlusSynchronizer;
@@ -52,16 +49,13 @@
 import org.runnerup.export.RunningFreeOnlineSynchronizer;
 import org.runnerup.export.RuntasticSynchronizer;
 import org.runnerup.export.StravaSynchronizer;
-import org.runnerup.export.SyncManager;
-import org.runnerup.export.Synchronizer;
 import org.runnerup.util.FileUtil;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class DBHelper extends SQLiteOpenHelper implements
         Constants {
 
@@ -195,7 +189,7 @@ public class DBHelper extends SQLiteOpenHelper implements
 
     private static synchronized DBHelper getHelper(Context context) {
         if (sInstance == null) {
-            sInstance = new DBHelper(context.getApplicationContext(), 1);
+            sInstance = new DBHelper(context.getApplicationContext());
         }
         return sInstance;
     }
@@ -226,10 +220,11 @@ public static synchronized SQLiteDatabase getWritableDatabase(Context context) {
         return sWritableDB;
     }
 
+    @SuppressWarnings("EmptyMethod")
     public static synchronized void closeDB(SQLiteDatabase db) {
     }
 
-    private DBHelper(Context context, int a) {
+    private DBHelper(Context context) {
         super(context, DBNAME, null, DBVERSION);
     }
 
@@ -414,10 +409,10 @@ private void migrateFileSynchronizerInfo(SQLiteDatabase arg0) {
                 tmp = new ContentValues();
                 tmp.put(DB.ACCOUNT.AUTH_CONFIG, authConfig);
                 arg0.update(DB.ACCOUNT.TABLE, tmp, DB.ACCOUNT.NAME + " = ?", args);
-            }
         }
-        c.close();
-    }
+        }
+                c.close();
+            }
 
     private void recreateAccount(SQLiteDatabase arg0) {
         StringBuilder newtab = new StringBuilder();
@@ -466,7 +461,7 @@ private static void insertAccounts(SQLiteDatabase arg0) {
         insertAccount(arg0, RunningAHEADSynchronizer.NAME);
         insertAccount(arg0, DigifitSynchronizer.NAME);
         insertAccount(arg0, StravaSynchronizer.NAME);
-        insertAccount(arg0, RunnerUpLiveSynchronizer.NAME, 0, (int) (1 << DB.ACCOUNT.FLAG_LIVE));
+        insertAccount(arg0, RunnerUpLiveSynchronizer.NAME, 0, 1 << DB.ACCOUNT.FLAG_LIVE);
         insertAccount(arg0, FacebookSynchronizer.NAME, 0, -1);
         //insertAccount(arg0, GooglePlusSynchronizer.NAME);
         //DBVERSION 26
@@ -502,9 +497,9 @@ private static void insertAccount(SQLiteDatabase arg0, String name, int enabled,
         long newId = arg0.insertWithOnConflict(DB.ACCOUNT.TABLE, null, arg1, SQLiteDatabase.CONFLICT_IGNORE);
         if (newId == -1 && arg1.size() > 1) {
             //values could be updated
-            String arr[] = {
-                    arg1.getAsString(DB.ACCOUNT.NAME)
-            };
+        String arr[] = {
+            arg1.getAsString(DB.ACCOUNT.NAME)
+        };
             //DBVERSION update
             arg1.remove(DB.ACCOUNT.FORMAT);
             arg1.remove(DB.ACCOUNT.AUTH_METHOD);
@@ -527,7 +522,7 @@ public static ContentValues get(Cursor c) {
     }
 
     public static ContentValues[] toArray(Cursor c) {
-        ArrayList<ContentValues> list = new ArrayList<ContentValues>();
+        ArrayList<ContentValues> list = new ArrayList<>();
         if (c.moveToFirst()) {
             do {
                 list.add(get(c));
@@ -547,6 +542,7 @@ public static void deleteActivity(SQLiteDatabase db, long id) {
         db.delete(DB.ACTIVITY.TABLE, "_id = ?", args);
     }
 
+    @SuppressLint("StaticFieldLeak")
     public static void purgeDeletedActivities(Context ctx, final ProgressDialog dialog,
                                               final Runnable onComplete) {
 
@@ -555,7 +551,7 @@ public static void purgeDeletedActivities(Context ctx, final ProgressDialog dial
         String from[] = { "_id" };
         Cursor c = db.query(DB.ACTIVITY.TABLE, from, "deleted <> 0",
                 null, null, null, null, null);
-        final ArrayList<Long> list = new ArrayList<Long>(10);
+        final ArrayList<Long> list = new ArrayList<>(10);
         if (c.moveToFirst()) {
             do {
                 list.add(c.getLong(0));
diff --git a/app/src/org/runnerup/db/entities/AbstractEntity.java b/app/src/org/runnerup/db/entities/AbstractEntity.java
index 2bec6d26b..6a0508770 100644
--- a/app/src/org/runnerup/db/entities/AbstractEntity.java
+++ b/app/src/org/runnerup/db/entities/AbstractEntity.java
@@ -18,7 +18,6 @@
 package org.runnerup.db.entities;
 
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.CursorIndexOutOfBoundsException;
@@ -31,7 +30,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public abstract class AbstractEntity implements DBEntity {
 
     private final ContentValues mContentValues;
@@ -43,14 +42,14 @@ public abstract class AbstractEntity implements DBEntity {
     protected abstract String getNullColumnHack();
 
 
-    public AbstractEntity() {
+    AbstractEntity() {
         this.mContentValues = new ContentValues();
     }
 
     /**
      * Returns the {@code ContentValues} wrapped by this object.
      */
-    protected final ContentValues values() {
+    final ContentValues values() {
         return mContentValues;
     }
 
@@ -61,7 +60,7 @@ public Long getId() {
         return null;
     }
 
-    public void setId(Long value) {
+    private void setId(Long value) {
         values().put(Constants.DB.PRIMARY_KEY, value);
     }
 
@@ -78,13 +77,15 @@ public void update(SQLiteDatabase db) {
         }
     }
 
-    protected void toContentValues(Cursor c) {
+    @SuppressLint("ObsoleteSdkInt")
+    void toContentValues(Cursor c) {
         if (c.isClosed() || c.isAfterLast() || c.isBeforeFirst()) {
             throw new CursorIndexOutOfBoundsException("Cursor not readable");
         }
 
         if (getValidColumns().containsAll(Arrays.asList(c.getColumnNames()))) {
             if (Build.VERSION.SDK_INT > 10) {
+                //noinspection AccessStaticViaInstance
                 this.cursorRowToContentValues(c, values());
             } else {
                 DatabaseUtils.cursorRowToContentValues(c, values());
@@ -131,6 +132,7 @@ public void readByPrimaryKey(SQLiteDatabase DB, long primaryKey) {
         getValidColumns().toArray(cols);
         Cursor cursor = DB.query(getTableName(), cols, "_id = "
                 + primaryKey, null, null, null, null);
+        //noinspection TryFinallyCanBeTryWithResources
         try {
             if (cursor.moveToFirst()) {
                 toContentValues(cursor);
diff --git a/app/src/org/runnerup/db/entities/ActivityEntity.java b/app/src/org/runnerup/db/entities/ActivityEntity.java
index 7ea2fd774..7dac9e020 100644
--- a/app/src/org/runnerup/db/entities/ActivityEntity.java
+++ b/app/src/org/runnerup/db/entities/ActivityEntity.java
@@ -17,9 +17,7 @@
 
 package org.runnerup.db.entities;
 
-import android.annotation.TargetApi;
 import android.database.Cursor;
-import android.os.Build;
 import android.util.Log;
 
 import org.runnerup.common.util.Constants;
@@ -33,17 +31,17 @@
 /**
  * Content values wrapper for the {@code activity} table.
  */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class ActivityEntity extends AbstractEntity {
 
-    private List<LapEntity> laps;
+    private final List<LapEntity> laps;
 
-    private List<LocationEntity> locationPoints;
+    private final List<LocationEntity> locationPoints;
 
     public ActivityEntity() {
         super();
-        laps = new ArrayList<LapEntity>();
-        locationPoints = new ArrayList<LocationEntity>();
+        laps = new ArrayList<>();
+        locationPoints = new ArrayList<>();
     }
 
     public ActivityEntity(Cursor c) {
@@ -240,7 +238,7 @@ protected String getNullColumnHack() {
         return Constants.DB.ACTIVITY.NULLCOLUMNHACK;
     }
 
-    public void addLap(LapEntity lap) {
+    private void addLap(LapEntity lap) {
         if (lap.getActivityId() != null && (this.getId() == null || !lap.getActivityId().equals(this.getId()))) {
             throw new IllegalArgumentException("Foreign key of lap (" + lap.getActivityId() +
                     ") doesn't match the activity primary key (" + this.getId() + ")");
@@ -253,7 +251,7 @@ public void addLap(LapEntity lap) {
         getLaps().add(lap);
     }
 
-    public void addLaps(List<LapEntity> laps) {
+    private void addLaps(List<LapEntity> laps) {
         for (LapEntity lap : laps) {
             this.addLap(lap);
         }
@@ -268,7 +266,7 @@ public List<LapEntity> getLaps() {
         return laps;
     }
 
-    public void addPoint(LocationEntity point) {
+    private void addPoint(LocationEntity point) {
         if (point.getActivityId() != null && (this.getId() == null || !point.getActivityId().equals(this.getId()))) {
             throw new IllegalArgumentException("Foreign key of point (" + point.getActivityId() +
                     ") doesn't match the activity primary key (" + this.getId() + ")");
@@ -281,7 +279,7 @@ public void addPoint(LocationEntity point) {
         getLocationPoints().add(point);
     }
 
-    public void addPoints(List<LocationEntity> points) {
+    private void addPoints(List<LocationEntity> points) {
         for (LocationEntity point : points) {
             this.addPoint(point);
         }
diff --git a/app/src/org/runnerup/db/entities/FeedEntity.java b/app/src/org/runnerup/db/entities/FeedEntity.java
index 0236b4859..673647344 100644
--- a/app/src/org/runnerup/db/entities/FeedEntity.java
+++ b/app/src/org/runnerup/db/entities/FeedEntity.java
@@ -17,9 +17,7 @@
 
 package org.runnerup.db.entities;
 
-import android.annotation.TargetApi;
 import android.database.Cursor;
-import android.os.Build;
 import android.util.Log;
 
 import org.runnerup.common.util.Constants;
@@ -29,7 +27,7 @@
 /**
  * Content values wrapper for the {@code feed} table.
  */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class FeedEntity extends AbstractEntity {
 
     public FeedEntity() {
@@ -223,7 +221,7 @@ public String getFlags() {
 
     @Override
     public ArrayList<String> getValidColumns() {
-        ArrayList<String> columns = new ArrayList<String>();
+        ArrayList<String> columns = new ArrayList<>();
         columns.add(Constants.DB.PRIMARY_KEY);
         columns.add(Constants.DB.FEED.ACCOUNT_ID);
         columns.add(Constants.DB.FEED.EXTERNAL_ID);
diff --git a/app/src/org/runnerup/db/entities/LapEntity.java b/app/src/org/runnerup/db/entities/LapEntity.java
index 7a2a9202d..b9720c266 100644
--- a/app/src/org/runnerup/db/entities/LapEntity.java
+++ b/app/src/org/runnerup/db/entities/LapEntity.java
@@ -17,9 +17,7 @@
 
 package org.runnerup.db.entities;
 
-import android.annotation.TargetApi;
 import android.database.Cursor;
-import android.os.Build;
 import android.util.Log;
 
 import org.runnerup.common.util.Constants;
@@ -29,7 +27,7 @@
 /**
  * Content values wrapper for the {@code lap} table.
  */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class LapEntity extends AbstractEntity {
 
     public LapEntity() {
diff --git a/app/src/org/runnerup/db/entities/LocationEntity.java b/app/src/org/runnerup/db/entities/LocationEntity.java
index 197c9fc86..7531a2a0a 100644
--- a/app/src/org/runnerup/db/entities/LocationEntity.java
+++ b/app/src/org/runnerup/db/entities/LocationEntity.java
@@ -17,11 +17,9 @@
 
 package org.runnerup.db.entities;
 
-import android.annotation.TargetApi;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.location.Location;
-import android.os.Build;
 
 import org.runnerup.common.util.Constants;
 
@@ -32,7 +30,7 @@
 /**
  * Content values wrapper for the {@code location} table.
  */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class LocationEntity extends AbstractEntity {
 
     private Double mDistance;
diff --git a/app/src/org/runnerup/export/DefaultSynchronizer.java b/app/src/org/runnerup/export/DefaultSynchronizer.java
index 570e4727b..a4ac114b0 100644
--- a/app/src/org/runnerup/export/DefaultSynchronizer.java
+++ b/app/src/org/runnerup/export/DefaultSynchronizer.java
@@ -17,20 +17,16 @@
 
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.util.Log;
 import android.util.Pair;
 
 import org.runnerup.common.util.Constants;
 import org.runnerup.db.DBHelper;
 import org.runnerup.db.entities.ActivityEntity;
-import org.runnerup.db.entities.LapEntity;
-import org.runnerup.db.entities.LocationEntity;
 import org.runnerup.export.util.FormValues;
 import org.runnerup.export.util.SyncHelper;
 import org.runnerup.feed.FeedList.FeedUpdater;
@@ -47,13 +43,13 @@
 import java.util.Map;
 import java.util.Set;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public abstract class DefaultSynchronizer implements Synchronizer {
 
-    protected final Set<String> cookies = new HashSet<String>();
-    protected final FormValues formValues = new FormValues();
+    final Set<String> cookies = new HashSet<>();
+    final FormValues formValues = new FormValues();
 
-    public DefaultSynchronizer() {
+    DefaultSynchronizer() {
         super();
         logout();
     }
@@ -140,7 +136,7 @@ public final Status download(SQLiteDatabase db, SyncActivityItem item) {
         return persistActivity(db, download(item));
     }
 
-    protected ActivityEntity download(SyncActivityItem item) {
+    ActivityEntity download(SyncActivityItem item) {
         Log.e(Constants.LOG, "No download method implemented for the synchronizer " + getName());
         return null;
     }
@@ -162,7 +158,7 @@ private Status persistActivity(SQLiteDatabase db, ActivityEntity activity) {
         }
 
         //update with activity id
-        activity.putPoints(new ArrayList<LocationEntity>(activity.getLocationPoints()));
+        activity.putPoints(new ArrayList<>(activity.getLocationPoints()));
         // insert location and end transaction unsuccessfully
         if (DBHelper.bulkInsert(activity.getLocationPoints(), db) != activity.getLocationPoints().size()) {
             db.endTransaction();
@@ -170,7 +166,7 @@ private Status persistActivity(SQLiteDatabase db, ActivityEntity activity) {
         }
 
         //update with activity id
-        activity.putLaps(new ArrayList<LapEntity>(activity.getLaps()));
+        activity.putLaps(new ArrayList<>(activity.getLaps()));
         // insert all lap objects
         if (DBHelper.bulkInsert(activity.getLaps(), db) != activity.getLaps().size()) {
             db.endTransaction();
@@ -198,7 +194,7 @@ public Status refreshToken() {
         return Status.ERROR;
     }
 
-    protected void addCookies(HttpURLConnection conn) {
+    void addCookies(HttpURLConnection conn) {
         boolean first = true;
         StringBuilder buf = new StringBuilder();
         for (String cookie : cookies) {
@@ -210,9 +206,9 @@ protected void addCookies(HttpURLConnection conn) {
         conn.addRequestProperty("Cookie", buf.toString());
     }
 
-    protected void getCookies(HttpURLConnection conn) {
+    void getCookies(HttpURLConnection conn) {
         List<String> connCookies = conn.getHeaderFields().get("Set-Cookie");
-        /**
+        /*
          * work-around for weird android 2.2 bug ref
          * http://stackoverflow.com/questions
          * /9134657/nullpointer-exception-with-
@@ -226,14 +222,14 @@ protected void getCookies(HttpURLConnection conn) {
         }
     }
 
-    protected void clearCookies() {
+    void clearCookies() {
         cookies.clear();
     }
 
-    protected String getFormValues(HttpURLConnection conn) throws IOException {
+    String getFormValues(HttpURLConnection conn) throws IOException {
         BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
         StringBuilder buf = new StringBuilder();
-        String s = null;
+        String s;
         while ((s = in.readLine()) != null) {
             buf.append(s);
         }
@@ -258,5 +254,5 @@ public String getUrl() {
 
     //Common helper
     //JSON getString() interprets null as the string "null"
-    public static String noNullStr(String s) { return ("null".equals(s)) ? null : s; }
+    static String noNullStr(String s) { return ("null".equals(s)) ? null : s; }
 }
diff --git a/app/src/org/runnerup/export/DigifitSynchronizer.java b/app/src/org/runnerup/export/DigifitSynchronizer.java
index ba99c1326..333fe1f92 100644
--- a/app/src/org/runnerup/export/DigifitSynchronizer.java
+++ b/app/src/org/runnerup/export/DigifitSynchronizer.java
@@ -25,12 +25,9 @@
 
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.util.Log;
-import android.util.Pair;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -42,36 +39,23 @@
 import org.runnerup.export.util.StringWritable;
 import org.runnerup.export.util.SyncHelper;
 
-import java.io.BufferedInputStream;
 import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.StringWriter;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.ProtocolException;
 import java.net.URL;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class DigifitSynchronizer extends DefaultSynchronizer {
-    public static final String DIGIFIT_URL = "http://my.digifit.com";
+    private static final String DIGIFIT_URL = "http://my.digifit.com";
 
     public static final String NAME = "Digifit";
     public static final String PUBLIC_URL = "http://www.digifit.com";
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String args[]) {
         if (args.length < 2) {
             Log.e("DigifitSynchronizer", "usage: DigifitSynchronizer username password");
             System.exit(1);
@@ -80,7 +64,7 @@ public static void main(String args[]) throws Exception {
         String username = args[0];
         String password = args[1];
 
-        DigifitSynchronizer du = new DigifitSynchronizer(null);
+        DigifitSynchronizer du = new DigifitSynchronizer();
         du.init(username, password);
 
         Log.e("DigifitSynchronizer", du.connect().toString());
@@ -91,20 +75,18 @@ public static void main(String args[]) throws Exception {
     private String _password;
     private String _username;
 
-    DigifitSynchronizer(SyncManager unused) {
-    }
-
-    private JSONObject buildRequest(String root, Map<String, String> requestParameters)
-            throws JSONException {
-        JSONObject json = new JSONObject();
-        JSONObject request = new JSONObject(requestParameters);
-        json.put(root, request);
-        return json;
-    }
+// --Commented out by Inspection START (2017-08-11 13:14):
+//    private JSONObject buildRequest(String root, Map<String, String> requestParameters)
+//            throws JSONException {
+//        JSONObject json = new JSONObject();
+//        JSONObject request = new JSONObject(requestParameters);
+//        json.put(root, request);
+//        return json;
+//    }
+// --Commented out by Inspection STOP (2017-08-11 13:14)
 
     private JSONObject callDigifitEndpoint(String url, JSONObject request) throws IOException,
-            MalformedURLException,
-            ProtocolException, JSONException {
+            JSONException {
         HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection();
         conn.setDoOutput(true);
         conn.setRequestMethod(RequestMethod.POST.name());
@@ -228,64 +210,67 @@ private void deleteFile(long fileId, String fileType) {
         }
     }
 
-    public void downloadActivity(File dst, String key) throws Exception {
-        Map<String, String> exportParameters = new HashMap<String, String>();
-        exportParameters.put("id", key);
-        exportParameters.put("format", "tcx");
-
-        long fileId = 0;
-        int fileSize = 0;
-
-        try {
-            JSONObject exportRequest = buildRequest("workout", exportParameters);
-            callDigifitEndpoint(DIGIFIT_URL + "/rpc/json/workout/export_web", exportRequest);
-
-            // I have observed Digifit taking >15 seconds to generate a file.
-            for (int i = 0; i < 60; i++) {
-                JSONObject workoutFile = getWorkoutFileId(key);
-                if (workoutFile != null) {
-                    fileId = workoutFile.getLong("file_id");
-                    fileSize = workoutFile.getInt("file_size");
-                    break;
-                }
-
-                Thread.sleep(500);
-            }
-
-            if (fileId == 0) {
-                Log.e(getName(), "export file not ready on Digifit within deadline");
-                return;
-            }
-
-            String downloadUrl = DIGIFIT_URL + "/workout/download/" + fileId;
-
-            HttpURLConnection conn = (HttpURLConnection) new URL(downloadUrl).openConnection();
-            conn.setRequestMethod(RequestMethod.GET.name());
-            addCookies(conn);
-
-            InputStream in = new BufferedInputStream(conn.getInputStream());
-            OutputStream out = new FileOutputStream(dst);
-            int cnt = 0, readLen = 0;
-            byte buf[] = new byte[1024];
-            while ((readLen = in.read(buf)) != -1) {
-                out.write(buf, 0, readLen);
-                cnt += readLen;
-            }
-            Log.e(getName(), "Expected " + fileSize + " bytes, got " + cnt + " bytes: "
-                    + (fileSize == cnt ? "OK" : "ERROR"));
-
-            in.close();
-            out.close();
-            conn.disconnect();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        } finally {
-            // If we error out above, try to ensure we clean up our mess.
-            if (fileId == 0) {
-                deleteFile(fileId, "export");
-            }
-        }
-    }
+// --Commented out by Inspection START (2017-08-11 13:04):
+//    public void downloadActivity(File dst, String key) {
+//        Map<String, String> exportParameters = new HashMap<>();
+//        exportParameters.put("id", key);
+//        exportParameters.put("format", "tcx");
+//
+//        long fileId = 0;
+//        int fileSize = 0;
+//
+//        try {
+//            JSONObject exportRequest = buildRequest("workout", exportParameters);
+//            callDigifitEndpoint(DIGIFIT_URL + "/rpc/json/workout/export_web", exportRequest);
+//
+//            // I have observed Digifit taking >15 seconds to generate a file.
+//            for (int i = 0; i < 60; i++) {
+//                JSONObject workoutFile = getWorkoutFileId(key);
+//                if (workoutFile != null) {
+//                    fileId = workoutFile.getLong("file_id");
+//                    fileSize = workoutFile.getInt("file_size");
+//                    break;
+//                }
+//
+//                Thread.sleep(500);
+//            }
+//
+//            if (fileId == 0) {
+//                Log.e(getName(), "export file not ready on Digifit within deadline");
+//                return;
+//            }
+//
+//            String downloadUrl = DIGIFIT_URL + "/workout/download/" + fileId;
+//
+//            HttpURLConnection conn = (HttpURLConnection) new URL(downloadUrl).openConnection();
+//            conn.setRequestMethod(RequestMethod.GET.name());
+//            addCookies(conn);
+//
+//            InputStream in = new BufferedInputStream(conn.getInputStream());
+//            OutputStream out = new FileOutputStream(dst);
+//            int cnt = 0;
+//            int readLen;
+//            byte buf[] = new byte[1024];
+//            while ((readLen = in.read(buf)) != -1) {
+//                out.write(buf, 0, readLen);
+//                cnt += readLen;
+//            }
+//            Log.e(getName(), "Expected " + fileSize + " bytes, got " + cnt + " bytes: "
+//                    + (fileSize == cnt ? "OK" : "ERROR"));
+//
+//            in.close();
+//            out.close();
+//            conn.disconnect();
+//        } catch (Exception ex) {
+//            ex.printStackTrace();
+//        } finally {
+//            // If we error out above, try to ensure we clean up our mess.
+//            if (fileId == 0) {
+//                deleteFile(fileId, "export");
+//            }
+//        }
+//    }
+// --Commented out by Inspection STOP (2017-08-11 13:04)
 
     @Override
     public String getAuthConfig() {
@@ -314,39 +299,38 @@ public String getName() {
     @Override
     public int getIconId() {return R.drawable.a9_digifit;}
 
-    private String getUploadUrl() throws IOException, MalformedURLException, ProtocolException,
-            JSONException {
+    private String getUploadUrl() throws IOException, JSONException {
         String getUploadUrl = DIGIFIT_URL + "/rpc/json/workout/import_workouts_url";
         JSONObject response = callDigifitEndpoint(getUploadUrl, new JSONObject());
 
-        String uploadUrl = response.getJSONObject("response").getJSONObject("upload_url")
+        return response.getJSONObject("response").getJSONObject("upload_url")
                 .getString("URL");
-        return uploadUrl;
     }
 
-    private JSONObject getWorkoutFileId(String key) throws IOException, MalformedURLException,
-            ProtocolException,
-            JSONException {
-        JSONObject exportListResponse = callDigifitEndpoint(DIGIFIT_URL
-                + "/rpc/json/workout/export_workouts_list",
-                new JSONObject());
-        Log.e(getName(), exportListResponse.toString());
-
-        JSONArray exportList = exportListResponse.getJSONObject("response").getJSONArray(
-                "export_list");
-
-        for (int idx = 0;; idx++) {
-            JSONObject export = exportList.optJSONObject(idx);
-            if (export == null) {
-                break;
-            }
-            long workoutId = export.getLong("workoutid");
-            if (("" + workoutId).equals(key)) {
-                return export;
-            }
-        }
-        return null;
-    }
+// --Commented out by Inspection START (2017-08-11 13:14):
+//    private JSONObject getWorkoutFileId(String key) throws IOException,
+//            JSONException {
+//        JSONObject exportListResponse = callDigifitEndpoint(DIGIFIT_URL
+//                + "/rpc/json/workout/export_workouts_list",
+//                new JSONObject());
+//        Log.e(getName(), exportListResponse.toString());
+//
+//        JSONArray exportList = exportListResponse.getJSONObject("response").getJSONArray(
+//                "export_list");
+//
+//        for (int idx = 0;; idx++) {
+//            JSONObject export = exportList.optJSONObject(idx);
+//            if (export == null) {
+//                break;
+//            }
+//            long workoutId = export.getLong("workoutid");
+//            if (("" + workoutId).equals(key)) {
+//                return export;
+//            }
+//        }
+//        return null;
+//    }
+// --Commented out by Inspection STOP (2017-08-11 13:14)
 
     @Override
     public void init(ContentValues config) {
@@ -366,7 +350,7 @@ public void init(ContentValues config) {
         }
     }
 
-    protected void init(String username, String password) {
+    private void init(String username, String password) {
         _username = username;
         _password = password;
     }
@@ -376,63 +360,65 @@ public boolean isConfigured() {
         return _username != null && _password != null;
     }
 
-    public Status activityList(List<Pair<String, String>> list) {
-        Status errorStatus = Status.ERROR;
-        Map<String, String> requestParameters = new HashMap<String, String>();
-        DateFormat rfc3339fmt = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss", Locale.US);
-        Date now = new Date();
-
-        /*
-         * For speed of loading (Digifit can be pokey), this month and last
-         * month.
-         */
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(now);
-        cal.add(Calendar.DATE, -30);
-        cal.set(Calendar.DAY_OF_MONTH, 1);
-        cal.set(Calendar.HOUR, 0);
-        cal.set(Calendar.MINUTE, 0);
-        cal.set(Calendar.SECOND, 0);
-        Date from = cal.getTime();
-
-        requestParameters.put("sortOrder", "1"); // Reverse chronological.
-        requestParameters.put("dateTo", rfc3339fmt.format(now));
-        requestParameters.put("dateFrom", rfc3339fmt.format(from));
-
-        try {
-            JSONObject request = buildRequest("workout", requestParameters);
-            JSONObject response = callDigifitEndpoint(DIGIFIT_URL + "/rpc/json/workout/list",
-                    request);
-
-            if (response == null)
-                return errorStatus;
-
-            JSONArray workouts = response.getJSONObject("response").getJSONArray("workouts");
-            for (int idx = 0;; idx++) {
-                JSONObject workout = workouts.optJSONObject(idx);
-                if (workout == null) {
-                    break;
-                }
-                StringBuilder title = new StringBuilder(workout.getJSONObject("description")
-                        .getString("title"));
-                String id = "" + workout.getLong("id");
-                String startTime = workout.getJSONObject("summary").getString("startTime");
-
-                // startTime is rfc3339, instead of parsing it, just strip
-                // everything but the date.
-                title.append(" (").append(startTime.substring(0, startTime.indexOf("T")))
-                        .append(")");
-
-                list.add(new Pair<String, String>(id, title.toString()));
-            }
-
-            return Status.OK;
-        } catch (Exception ex) {
-            Log.e(getName(), ex.toString());
-            errorStatus.ex = ex;
-        }
-        return errorStatus;
-    }
+// --Commented out by Inspection START (2017-08-11 13:04):
+//    public Status activityList(List<Pair<String, String>> list) {
+//        Status errorStatus = Status.ERROR;
+//        Map<String, String> requestParameters = new HashMap<>();
+//        DateFormat rfc3339fmt = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss", Locale.US);
+//        Date now = new Date();
+//
+//        /*
+//         * For speed of loading (Digifit can be pokey), this month and last
+//         * month.
+//         */
+//        Calendar cal = Calendar.getInstance();
+//        cal.setTime(now);
+//        cal.add(Calendar.DATE, -30);
+//        cal.set(Calendar.DAY_OF_MONTH, 1);
+//        cal.set(Calendar.HOUR, 0);
+//        cal.set(Calendar.MINUTE, 0);
+//        cal.set(Calendar.SECOND, 0);
+//        Date from = cal.getTime();
+//
+//        requestParameters.put("sortOrder", "1"); // Reverse chronological.
+//        requestParameters.put("dateTo", rfc3339fmt.format(now));
+//        requestParameters.put("dateFrom", rfc3339fmt.format(from));
+//
+//        try {
+//            JSONObject request = buildRequest("workout", requestParameters);
+//            JSONObject response = callDigifitEndpoint(DIGIFIT_URL + "/rpc/json/workout/list",
+//                    request);
+//
+//            if (response == null)
+//                return errorStatus;
+//
+//            JSONArray workouts = response.getJSONObject("response").getJSONArray("workouts");
+//            for (int idx = 0;; idx++) {
+//                JSONObject workout = workouts.optJSONObject(idx);
+//                if (workout == null) {
+//                    break;
+//                }
+//                StringBuilder title = new StringBuilder(workout.getJSONObject("description")
+//                        .getString("title"));
+//                String id = "" + workout.getLong("id");
+//                String startTime = workout.getJSONObject("summary").getString("startTime");
+//
+//                // startTime is rfc3339, instead of parsing it, just strip
+//                // everything but the date.
+//                title.append(" (").append(startTime.substring(0, startTime.indexOf("T")))
+//                        .append(")");
+//
+//                list.add(new Pair<>(id, title.toString()));
+//            }
+//
+//            return Status.OK;
+//        } catch (Exception ex) {
+//            Log.e(getName(), ex.toString());
+//            errorStatus.ex = ex;
+//        }
+//        return errorStatus;
+//    }
+// --Commented out by Inspection STOP (2017-08-11 13:04)
 
     @Override
     public void reset() {
@@ -488,9 +474,9 @@ private void uploadFileToDigifit(String payload, String uploadUrl) throws Except
 
         String filename = "RunnerUp.tcx";
 
-        Part<StringWritable> themePart = new Part<StringWritable>("theme", new StringWritable(
+        Part<StringWritable> themePart = new Part<>("theme", new StringWritable(
                 SyncHelper.URLEncode("site")));
-        Part<StringWritable> payloadPart = new Part<StringWritable>("userFiles",
+        Part<StringWritable> payloadPart = new Part<>("userFiles",
                 new StringWritable(payload));
         payloadPart.setFilename(filename);
         payloadPart.setContentType("application/octet-stream");
diff --git a/app/src/org/runnerup/export/EndomondoSynchronizer.java b/app/src/org/runnerup/export/EndomondoSynchronizer.java
index 313e9a7ec..7dfe81961 100644
--- a/app/src/org/runnerup/export/EndomondoSynchronizer.java
+++ b/app/src/org/runnerup/export/EndomondoSynchronizer.java
@@ -17,11 +17,10 @@
 
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.util.Log;
+import android.util.SparseArray;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -60,7 +59,7 @@
  * @author jonas Based on https://github.com/cpfair/tapiriik
  */
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class EndomondoSynchronizer extends DefaultSynchronizer {
 
     public static final String NAME = "Endomondo";
@@ -69,30 +68,27 @@ public class EndomondoSynchronizer extends DefaultSynchronizer {
     private static final String UPLOAD_URL = "http://api.mobile.endomondo.com/mobile/track";
     private static final String FEED_URL = "http://api.mobile.endomondo.com/mobile/api/feed";
 
-    long id = 0;
+    private long id = 0;
     private String username = null;
     private String password = null;
     private String deviceId = null;
     private String authToken = null;
 
-    public static final Map<Integer, Sport> endomondo2sportMap = new HashMap<Integer, Sport>();
-    public static final Map<Sport, Integer> sport2endomondoMap = new HashMap<Sport, Integer>();
+    private static final SparseArray<Sport> endomondo2sportMap = new SparseArray<>();
+    public static final Map<Sport, Integer> sport2endomondoMap = new HashMap<>();
     static {
         //list of sports ID can be found at
         // https://github.com/isoteemu/sports-tracker-liberator/blob/master/endomondo/workout.py
-        endomondo2sportMap.put(0, Sport.RUNNING);
-        endomondo2sportMap.put(2, Sport.BIKING);
-        endomondo2sportMap.put(22, Sport.OTHER);
-        endomondo2sportMap.put(17, Sport.ORIENTEERING);
-        endomondo2sportMap.put(18, Sport.WALKING);
-        for (Integer i : endomondo2sportMap.keySet()) {
-            sport2endomondoMap.put(endomondo2sportMap.get(i), i);
+        sport2endomondoMap.put(Sport.RUNNING, 0);
+        sport2endomondoMap.put(Sport.BIKING, 2);
+        sport2endomondoMap.put(Sport.OTHER, 22);
+        sport2endomondoMap.put(Sport.ORIENTEERING, 17);
+        sport2endomondoMap.put(Sport.WALKING, 18);
+        for (Sport s : sport2endomondoMap.keySet()) {
+            endomondo2sportMap.put(sport2endomondoMap.get(s), s);
         }
     }
 
-    EndomondoSynchronizer(SyncManager syncManager) {
-    }
-
     @Override
     public long getId() {
         return id;
@@ -125,10 +121,7 @@ public void init(ContentValues config) {
 
     @Override
     public boolean isConfigured() {
-        if (username != null && password != null && deviceId != null && authToken != null) {
-            return true;
-        }
-        return false;
+        return username != null && password != null && deviceId != null && authToken != null;
     }
 
     @Override
@@ -166,20 +159,19 @@ public Status connect() {
             return s;
         }
 
-        /**
+        /*
          * Generate deviceId
          */
         deviceId = UUID.randomUUID().toString();
 
-        Exception ex = null;
+        Exception ex;
         HttpURLConnection conn = null;
         logout();
         try {
 
-            /**
+            /*
 			 *
 			 */
-            String login = AUTH_URL;
             FormValues kv = new FormValues();
             kv.put("email", username);
             kv.put("password", password);
@@ -188,7 +180,7 @@ public Status connect() {
             kv.put("deviceId", deviceId);
             kv.put("country", "N/A");
 
-            conn = (HttpURLConnection) new URL(login).openConnection();
+            conn = (HttpURLConnection) new URL(AUTH_URL).openConnection();
             conn.setDoOutput(true);
             conn.setRequestMethod(RequestMethod.POST.name());
             conn.addRequestProperty("Content-Type", "application/x-www-form-urlencoded");
@@ -226,9 +218,7 @@ public Status connect() {
 
         s = Synchronizer.Status.ERROR;
         s.ex = ex;
-        if (ex != null) {
-            ex.printStackTrace();
-        }
+        ex.printStackTrace();
         return s;
     }
 
@@ -256,8 +246,8 @@ public Status upload(SQLiteDatabase db, long mID) {
         }
 
         EndomondoTrack tcx = new EndomondoTrack(db);
-        HttpURLConnection conn = null;
-        Exception ex = null;
+        HttpURLConnection conn;
+        Exception ex;
         try {
             EndomondoTrack.Summary summary = new EndomondoTrack.Summary();
             StringWriter writer = new StringWriter();
@@ -310,9 +300,7 @@ public Status upload(SQLiteDatabase db, long mID) {
 
         s = Synchronizer.Status.ERROR;
         s.ex = ex;
-        if (ex != null) {
-            ex.printStackTrace();
-        }
+        ex.printStackTrace();
         return s;
     }
 
@@ -343,8 +331,8 @@ public Status getFeed(FeedUpdater feedUpdater) {
         url.append(FEED_URL).append("?authToken=").append(authToken);
         url.append("&maxResults=25");
 
-        HttpURLConnection conn = null;
-        Exception ex = null;
+        HttpURLConnection conn;
+        Exception ex;
         try {
             conn = (HttpURLConnection) new URL(url.toString()).openConnection();
             conn.setRequestMethod(RequestMethod.GET.name());
@@ -368,9 +356,7 @@ public Status getFeed(FeedUpdater feedUpdater) {
 
         s = Synchronizer.Status.ERROR;
         s.ex = ex;
-        if (ex != null) {
-            ex.printStackTrace();
-        }
+        ex.printStackTrace();
         return s;
     }
 
@@ -410,7 +396,7 @@ private ContentValues parseWorkout(SimpleDateFormat df, JSONObject o) throws JSO
         SyncHelper.setName(c, o.getJSONObject("from").getString("name"));
         final String IMAGE_URL = "http://image.endomondo.com/resources/gfx/picture/%d/thumbnail.jpg";
         c.put(FEED.USER_IMAGE_URL,
-                String.format(IMAGE_URL, o.getJSONObject("from").getLong("picture")));
+                String.format(Locale.ENGLISH, IMAGE_URL, o.getJSONObject("from").getLong("picture")));
         c.put(FEED.START_TIME, df.parse(o.getString("order_time")).getTime());
 
         final JSONObject m = o.getJSONObject("message");
@@ -418,7 +404,7 @@ private ContentValues parseWorkout(SimpleDateFormat df, JSONObject o) throws JSO
         setDistanceDuration(c, m.getString("text.win"));
 
         final String WORKOUT_URL = "http://www.endomondo.com/workouts/%d/%d";
-        c.put(DB.FEED.URL, String.format(WORKOUT_URL,
+        c.put(DB.FEED.URL, String.format(Locale.ENGLISH, WORKOUT_URL,
                 m.getJSONArray("actions").getJSONObject(0).getLong("id"),
                 o.getJSONObject("from").getLong("id")));
         return c;
diff --git a/app/src/org/runnerup/export/FacebookSynchronizer.java b/app/src/org/runnerup/export/FacebookSynchronizer.java
index eb59ede2c..46854ec5a 100644
--- a/app/src/org/runnerup/export/FacebookSynchronizer.java
+++ b/app/src/org/runnerup/export/FacebookSynchronizer.java
@@ -17,14 +17,12 @@
 
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
-import android.os.Build;
 import android.util.Log;
 
 import org.json.JSONException;
@@ -38,11 +36,9 @@
 import org.runnerup.export.util.StringWritable;
 import org.runnerup.export.util.SyncHelper;
 import org.runnerup.util.Bitfield;
-import org.runnerup.view.FeedActivity;
 import org.runnerup.workout.Sport;
 
 import java.io.BufferedInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -51,7 +47,7 @@
 import java.util.Date;
 import java.util.Locale;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class FacebookSynchronizer extends DefaultSynchronizer implements OAuth2Server {
 
     public static final String NAME = "Facebook";
@@ -60,21 +56,18 @@ public class FacebookSynchronizer extends DefaultSynchronizer implements OAuth2S
     /**
      * @todo register OAuth2Server
      */
-    public static String CLIENT_ID = null;
-    public static String CLIENT_SECRET = null;
+    private static String CLIENT_ID = null;
+    private static String CLIENT_SECRET = null;
 
-    public static final String AUTH_URL = "https://www.facebook.com/dialog/oauth";
-    public static final String TOKEN_URL = "https://graph.facebook.com/oauth/access_token";
-    public static final String REDIRECT_URI = "http://localhost:8080/runnerup/facebook";
+    private static final String AUTH_URL = "https://www.facebook.com/dialog/oauth";
+    private static final String TOKEN_URL = "https://graph.facebook.com/oauth/access_token";
+    private static final String REDIRECT_URI = "http://localhost:8080/runnerup/facebook";
 
     private static final String COURSE_ENDPOINT = "https://graph.facebook.com/me/objects/fitness.course";
     private static final String RUN_ENDPOINT = "https://graph.facebook.com/me/fitness.runs";
     private static final String BIKE_ENDPOINT = "https://graph.facebook.com/me/fitness.bikes";
     private static final String WALK_ENDPOINT = "https://graph.facebook.com/me/fitness.walks";
 
-    final boolean uploadComment = false;
-    final boolean explicitly_shared = false; // Doesn't work now...don't know why...
-
     private long id = 0;
     private String access_token = null;
     private long token_now = 0;
@@ -82,7 +75,7 @@ public class FacebookSynchronizer extends DefaultSynchronizer implements OAuth2S
     private boolean skipMapInPost = false;
     private final Context context;
 
-    final SimpleDateFormat dateFormat = new SimpleDateFormat(
+    private final SimpleDateFormat dateFormat = new SimpleDateFormat(
             "yyyy-MM-dd HH:mm:ss.SSSZ", Locale.getDefault());
 
     FacebookSynchronizer(Context context, SyncManager syncManager) {
@@ -207,10 +200,8 @@ public Status getAuthResult(int resultCode, Intent data) {
 
     @Override
     public boolean isConfigured() {
-        if (access_token == null)
-            return false;
+        return access_token != null;
 
-        return true;
     }
 
     @Override
@@ -220,7 +211,7 @@ public void reset() {
         token_now = 0;
     }
 
-    public static final long ONE_DAY = 24 * 60 * 60;
+    private static final long ONE_DAY = 24 * 60 * 60;
 
     @Override
     public Status connect() {
@@ -300,8 +291,7 @@ private JSONObject createObj(URL url, Part<?> parts[]) throws Exception{
             return runRef;
         }
     }
-    private JSONObject createCourse(JSONObject course) throws JSONException,
-            IOException, Exception {
+    private JSONObject createCourse(JSONObject course) throws Exception {
         JSONObject obj = new JSONObject();
         /* create a facebook course instance */
         obj.put("fb:app_id", FacebookSynchronizer.CLIENT_ID);
@@ -309,10 +299,10 @@ private JSONObject createCourse(JSONObject course) throws JSONException,
         obj.put("og:title", "a RunnerUp course");
         obj.put("fitness", course);
 
-        Part<StringWritable> themePart = new Part<StringWritable>(
+        Part<StringWritable> themePart = new Part<>(
                 "access_token", new StringWritable(
-                        SyncHelper.URLEncode(access_token)));
-        Part<StringWritable> payloadPart = new Part<StringWritable>("object",
+                SyncHelper.URLEncode(access_token)));
+        Part<StringWritable> payloadPart = new Part<>("object",
                 new StringWritable(obj.toString()));
         Part<?> parts[] = {
                 themePart, payloadPart
@@ -337,26 +327,28 @@ private JSONObject createRun(JSONObject ref, JSONObject runObj) throws Exception
             return null;
         }
         String id = ref.getString("id");
-        ArrayList<Part<?>> list = new ArrayList<Part<?>>();
-        list.add(new Part<StringWritable>("access_token",
+        ArrayList<Part<?>> list = new ArrayList<>();
+        list.add(new Part<>("access_token",
                 new StringWritable(SyncHelper.URLEncode(access_token))));
-        list.add(new Part<StringWritable>("course",
+        list.add(new Part<>("course",
                 new StringWritable(id)));
-        if (explicitly_shared)
-            list.add(new Part<StringWritable>(
-                    "fb:explicitly_shared", new StringWritable("true")));
+        //boolean explicitly_shared = false; // Doesn't work now...don't know why...
+        //if (explicitly_shared)
+        //    list.add(new Part<>(
+        //            "fb:explicitly_shared", new StringWritable("true")));
 
-        list.add(new Part<StringWritable>(
+        list.add(new Part<>(
                 "start_time", new StringWritable(formatTime(runObj.getLong("startTime")))));
         if (runObj.has("endTime")) {
-            list.add(new Part<StringWritable>(
+            list.add(new Part<>(
                     "end_time", new StringWritable(formatTime(runObj.getLong("endTime")))));
         }
 
-        if (uploadComment && runObj.has("comment")) {
-            list.add(new Part<StringWritable>(
-                    "message", new StringWritable(runObj.getString("comment"))));
-        }
+        //boolean uploadComment = false;
+        //if (uploadComment && runObj.has("comment")) {
+        //    list.add(new Part<>(
+        //            "message", new StringWritable(runObj.getString("comment"))));
+        //}
 
         Part<?> parts[] = new Part<?>[list.size()];
         list.toArray(parts);
@@ -369,6 +361,7 @@ private String formatTime(long long1) {
         return dateFormat.format(new Date(1000 * long1));
     }
 
+    @SuppressWarnings("EmptyMethod")
     private void deleteCourse(JSONObject ref) {
     }
 
diff --git a/app/src/org/runnerup/export/FileSynchronizer.java b/app/src/org/runnerup/export/FileSynchronizer.java
index fc2a2619f..c62cfc73c 100644
--- a/app/src/org/runnerup/export/FileSynchronizer.java
+++ b/app/src/org/runnerup/export/FileSynchronizer.java
@@ -17,11 +17,9 @@
 
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
-import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -40,7 +38,7 @@
 import java.io.OutputStreamWriter;
 import java.util.Locale;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class FileSynchronizer extends DefaultSynchronizer {
 
     public static final String NAME = "File";
@@ -102,7 +100,7 @@ public String getAuthConfig() {
                 tmp.put(DB.ACCOUNT.FORMAT, mFormat);
             } catch (JSONException e) {
                 Log.w(getName(), "getAuthConfig: Failure to create json for " + mPath + ", " + mFormat + ", " + e);
-            }
+    }
         }
         return tmp.toString();
     }
diff --git a/app/src/org/runnerup/export/FunBeatSynchronizer.java b/app/src/org/runnerup/export/FunBeatSynchronizer.java
index 90949d819..e68686bbd 100644
--- a/app/src/org/runnerup/export/FunBeatSynchronizer.java
+++ b/app/src/org/runnerup/export/FunBeatSynchronizer.java
@@ -17,11 +17,10 @@
 
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.util.Log;
+import android.util.SparseArray;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -50,39 +49,37 @@
 import java.net.URL;
 import java.security.NoSuchAlgorithmException;
 import java.security.SignatureException;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * TODO: 1) serious cleanup needed 2) maybe reverse engineer
  * 1.0.0.api.funbeat.se that I found...
  */
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class FunBeatSynchronizer extends DefaultSynchronizer {
 
     public static final String NAME = "FunBeat";
-    public static final String PUBLIC_URL = "http://www.funbeat.se";
+    private static final String PUBLIC_URL = "http://www.funbeat.se";
     private static final String BASE_URL = PUBLIC_URL;
     private static final String START_URL = BASE_URL + "/index.aspx";
     private static final String LOGIN_URL = BASE_URL + "/index.aspx";
     private static final String UPLOAD_URL = BASE_URL
             + "/importexport/upload.aspx";
 
-    public static final String API_URL = "http://1.0.0.android.api.funbeat.se/json/Default.asmx/";
-    public static final String FEED_URL = API_URL + "GetMyNewsFeed";
+    private static final String API_URL = "http://1.0.0.android.api.funbeat.se/json/Default.asmx/";
+    private static final String FEED_URL = API_URL + "GetMyNewsFeed";
 
     private static String APP_ID = null;
     private static String APP_SECRET = null;
 
-    long id = 0;
+    private long id = 0;
     private String username = null;
     private String password = null;
     private String loginID = null;
     private String loginSecretHashed = null;
 
-    static final Map<Integer, Sport> funbeat2sportMap = new HashMap<Integer, Sport>();
-    static final Map<Sport, Integer> sport2funbeatMap = new HashMap<Sport, Integer>();
+    private static final SparseArray<Sport> funbeat2sportMap = new SparseArray<>();
+    //private static final Map<Sport, Integer> sport2funbeatMap = new HashMap<>();
     static {
         // the best (known) way to get ID for a given sport is:
         // 1) create a workout on the website funbeat.se with the desired sport type
@@ -93,9 +90,9 @@ public class FunBeatSynchronizer extends DefaultSynchronizer {
         funbeat2sportMap.put(51, Sport.OTHER);
         funbeat2sportMap.put(26, Sport.ORIENTEERING);
         funbeat2sportMap.put(417, Sport.WALKING);
-        for (Integer i : funbeat2sportMap.keySet()) {
-            sport2funbeatMap.put(funbeat2sportMap.get(i), i);
-        }
+        //for (Integer i : funbeat2sportMap.keySet()) {
+        //    sport2funbeatMap.put(funbeat2sportMap.get(i), i);
+        //}
     }
 
     FunBeatSynchronizer(SyncManager syncManager) {
@@ -142,9 +139,7 @@ public void init(ContentValues config) {
 
     @Override
     public boolean isConfigured() {
-        if (username != null && password != null)
-            return true;
-        return false;
+        return username != null && password != null;
     }
 
     @Override
@@ -171,7 +166,7 @@ public String getAuthConfig() {
 
     @Override
     public Status connect() {
-        Exception ex = null;
+        Exception ex;
         HttpURLConnection conn = null;
         cookies.clear();
         formValues.clear();
@@ -188,7 +183,7 @@ public Status connect() {
         }
 
         try {
-            /**
+            /*
              * connect to START_URL to get cookies/formValues
              */
             conn = (HttpURLConnection) new URL(START_URL).openConnection();
@@ -203,7 +198,7 @@ public Status connect() {
             }
             conn.disconnect();
 
-            /**
+            /*
              * Then login using a post
              */
             FormValues kv = new FormValues();
@@ -226,7 +221,7 @@ public Status connect() {
                     "application/x-www-form-urlencoded");
             addCookies(conn);
 
-            boolean ok = false;
+            boolean ok;
             {
                 OutputStream wr = new BufferedOutputStream(
                         conn.getOutputStream());
@@ -244,8 +239,8 @@ public Status connect() {
                     conn.setInstanceFollowRedirects(false);
                     conn.setRequestMethod(RequestMethod.GET.name());
                     addCookies(conn);
-                    responseCode = conn.getResponseCode();
-                    amsg = conn.getResponseMessage();
+                    //responseCode = conn.getResponseCode();
+                    //amsg = conn.getResponseMessage();
                     getCookies(conn);
                 } else if (responseCode != HttpURLConnection.HTTP_OK) {
                     Log.e(getName(), "FunBeatSynchronizer::connect() - got " + responseCode
@@ -272,9 +267,7 @@ public Status connect() {
             conn.disconnect();
 
         s.ex = ex;
-        if (ex != null) {
-            ex.printStackTrace();
-        }
+        ex.printStackTrace();
         return s;
     }
 
@@ -349,8 +342,8 @@ public Status upload(SQLiteDatabase db, long mID) {
         }
 
         TCX tcx = new TCX(db);
-        HttpURLConnection conn = null;
-        Exception ex = null;
+        HttpURLConnection conn;
+        Exception ex;
         try {
             StringWriter writer = new StringWriter();
             String id = tcx.export(mID, writer);
@@ -365,18 +358,18 @@ public Status upload(SQLiteDatabase db, long mID) {
             String fileKey = SyncHelper.findName(formValues.keySet(), "FileUpload");
             String uploadKey = SyncHelper.findName(formValues.keySet(), "UploadButton");
 
-            Part<StringWritable> part1 = new Part<StringWritable>(viewKey,
+            Part<StringWritable> part1 = new Part<>(viewKey,
                     new StringWritable(formValues.get(viewKey)));
 
-            Part<StringWritable> part2 = new Part<StringWritable>(eventKey,
+            Part<StringWritable> part2 = new Part<>(eventKey,
                     new StringWritable(formValues.get(eventKey)));
 
-            Part<StringWritable> part3 = new Part<StringWritable>(fileKey,
+            Part<StringWritable> part3 = new Part<>(fileKey,
                     new StringWritable(writer.toString()));
             part3.setContentType("application/octet-stream");
             part3.setFilename("jonas.tcx");
 
-            Part<StringWritable> part4 = new Part<StringWritable>(uploadKey,
+            Part<StringWritable> part4 = new Part<>(uploadKey,
                     new StringWritable(formValues.get(uploadKey)));
             Part<?> parts[] = {
                     part1, part2, part3, part4
@@ -400,8 +393,8 @@ public Status upload(SQLiteDatabase db, long mID) {
                 conn.setInstanceFollowRedirects(false);
                 conn.setRequestMethod(RequestMethod.GET.name());
                 addCookies(conn);
-                responseCode = conn.getResponseCode();
-                amsg = conn.getResponseMessage();
+                //responseCode = conn.getResponseCode();
+                //amsg = conn.getResponseMessage();
                 getCookies(conn);
             } else if (responseCode != HttpURLConnection.HTTP_OK) {
                 Log.e(getName(), "FunBeatSynchronizer::upload() - got " + responseCode + ", msg: "
@@ -436,7 +429,7 @@ public Status upload(SQLiteDatabase db, long mID) {
                 wr.flush();
                 wr.close();
                 responseCode = conn.getResponseCode();
-                amsg = conn.getResponseMessage();
+                //amsg = conn.getResponseMessage();
                 getCookies(conn);
                 if (responseCode == HttpURLConnection.HTTP_MOVED_TEMP) {
                     redirect = conn.getHeaderField("Location");
@@ -446,8 +439,8 @@ public Status upload(SQLiteDatabase db, long mID) {
                     conn.setInstanceFollowRedirects(false);
                     conn.setRequestMethod(RequestMethod.GET.name());
                     addCookies(conn);
-                    responseCode = conn.getResponseCode();
-                    amsg = conn.getResponseMessage();
+                    //responseCode = conn.getResponseCode();
+                    //amsg = conn.getResponseMessage();
                     getCookies(conn);
                 }
                 String html = getFormValues(conn);
@@ -469,9 +462,7 @@ public Status upload(SQLiteDatabase db, long mID) {
 
         s = Synchronizer.Status.ERROR;
         s.ex = ex;
-        if (ex != null) {
-            ex.printStackTrace();
-        }
+        ex.printStackTrace();
         return s;
     }
 
diff --git a/app/src/org/runnerup/export/GarminSynchronizer.java b/app/src/org/runnerup/export/GarminSynchronizer.java
index fdf78ecea..b12371c60 100644
--- a/app/src/org/runnerup/export/GarminSynchronizer.java
+++ b/app/src/org/runnerup/export/GarminSynchronizer.java
@@ -17,10 +17,8 @@
 
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.util.Log;
 import android.util.Pair;
 
@@ -52,42 +50,40 @@
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class GarminSynchronizer extends DefaultSynchronizer {
 
     public static final String NAME = "Garmin";
-    public static final String PUBLIC_URL = "http://connect.garmin.com";
+    private static final String PUBLIC_URL = "http://connect.garmin.com";
 
     private static final String CHOOSE_URL = PUBLIC_URL + "/";
 
-    public static final String START_URL = "https://connect.garmin.com/signin";
-    public static final String LOGIN_URL = "https://connect.garmin.com/signin";
-    public static final String CHECK_URL = "http://connect.garmin.com/user/username";
-    public static final String UPLOAD_URL = "https://connect.garmin.com/proxy/upload-service-1.1/json/upload/.tcx";
-    public static final String LIST_WORKOUTS_URL = "https://connect.garmin.com/proxy/workout-service-1.0/json/workoutlist";
-    public static final String GET_WORKOUT_URL = "https://connect.garmin.com/proxy/workout-service-1.0/json/workout/";
-    public static final String CALENDAR_URL = "https://connect.garmin.com/proxy/calendar-service/year/%1$tY/month/%2$d/day/%1te/start/1";
-    public static final String SCHEDULE_URL = "https://connect.garmin.com/proxy/workout-service-1.0/json/workoutschedule?workoutScheduleId=";
-    public static final String SET_TYPE_URL = "https://connect.garmin.com/proxy/activity-service-1.2/json/type/";
+    private static final String START_URL = "https://connect.garmin.com/signin";
+    private static final String LOGIN_URL = "https://connect.garmin.com/signin";
+    private static final String CHECK_URL = "http://connect.garmin.com/user/username";
+    private static final String UPLOAD_URL = "https://connect.garmin.com/proxy/upload-service-1.1/json/upload/.tcx";
+    private static final String LIST_WORKOUTS_URL = "https://connect.garmin.com/proxy/workout-service-1.0/json/workoutlist";
+    private static final String GET_WORKOUT_URL = "https://connect.garmin.com/proxy/workout-service-1.0/json/workout/";
+    private static final String CALENDAR_URL = "https://connect.garmin.com/proxy/calendar-service/year/%1$tY/month/%2$d/day/%1te/start/1";
+    private static final String SCHEDULE_URL = "https://connect.garmin.com/proxy/workout-service-1.0/json/workoutschedule?workoutScheduleId=";
+    private static final String SET_TYPE_URL = "https://connect.garmin.com/proxy/activity-service-1.2/json/type/";
 
     //TCX format supports only 2 sports by default (Running / Biking);
     // Otherwise "other" is chosen and we have to edit the workout to add the real sport
     //list of sports ID can be found on Garmin website when editing an activity:
-    public static final Map<Sport, String> sport2garminMap = new HashMap<Sport, String>();
+    private static final Map<Sport, String> sport2garminMap = new HashMap<>();
     static {
         sport2garminMap.put(Sport.WALKING, "walking");
     }
 
-    long id = 0;
+    private long id = 0;
     private String username = null;
     private String password = null;
     private boolean isConnected = false;
 
-    GarminSynchronizer(SyncManager syncManager) {
-    }
-
     @Override
     public long getId() {
         return id;
@@ -118,9 +114,7 @@ public void init(ContentValues config) {
 
     @Override
     public boolean isConfigured() {
-        if (username != null && password != null)
-            return true;
-        return false;
+        return username != null && password != null;
     }
 
     @Override
@@ -193,13 +187,13 @@ public Status connect() {
         return s;
     }
 
-    private Status connectOld() throws MalformedURLException, IOException, JSONException {
+    private Status connectOld() throws IOException, JSONException {
         Status s = Status.NEED_AUTH;
         s.authMethod = Synchronizer.AuthMethod.USER_PASS;
 
-        HttpURLConnection conn = null;
+        HttpURLConnection conn;
 
-        /**
+        /*
          * connect to START_URL to get cookies
          */
         conn = (HttpURLConnection) new URL(START_URL).openConnection();
@@ -214,10 +208,9 @@ private Status connectOld() throws MalformedURLException, IOException, JSONExcep
         }
         conn.disconnect();
 
-        /**
+        /*
          * Then login using a post
          */
-        String login = LOGIN_URL;
         FormValues kv = new FormValues();
         kv.put("login", "login");
         kv.put("login:loginUsernameField", username);
@@ -225,7 +218,7 @@ private Status connectOld() throws MalformedURLException, IOException, JSONExcep
         kv.put("login:signInButton", "Sign In");
         kv.put("javax.faces.ViewState", "j_id1");
 
-        conn = (HttpURLConnection) new URL(login).openConnection();
+        conn = (HttpURLConnection) new URL(LOGIN_URL).openConnection();
         conn.setDoOutput(true);
         conn.setRequestMethod(RequestMethod.POST.name());
         conn.addRequestProperty("Content-Type", "application/x-www-form-urlencoded");
@@ -243,13 +236,13 @@ private Status connectOld() throws MalformedURLException, IOException, JSONExcep
         }
         conn.disconnect();
 
-        /**
+        /*
          * An finally check that all is OK
          */
         return checkLogin();
     }
 
-    private Status checkLogin() throws MalformedURLException, IOException, JSONException {
+    private Status checkLogin() throws IOException, JSONException {
         HttpURLConnection conn = (HttpURLConnection) new URL(CHECK_URL).openConnection();
         addCookies(conn);
         {
@@ -276,7 +269,7 @@ private Status checkLogin() throws MalformedURLException, IOException, JSONExcep
         }
     }
 
-    private Status connectNew() throws MalformedURLException, IOException, JSONException {
+    private Status connectNew() throws IOException {
         Status s = Status.NEED_AUTH;
         s.authMethod = Synchronizer.AuthMethod.USER_PASS;
 
@@ -346,7 +339,7 @@ private Status connectNew() throws MalformedURLException, IOException, JSONExcep
         return Status.OK; // return checkLogin();
     }
 
-    private HttpURLConnection open(String base, FormValues fv) throws MalformedURLException,
+    private HttpURLConnection open(String base, FormValues fv) throws
             IOException {
         HttpURLConnection conn;
         if (fv != null) {
@@ -358,7 +351,7 @@ private HttpURLConnection open(String base, FormValues fv) throws MalformedURLEx
         return conn;
     }
 
-    private HttpURLConnection get(String base, FormValues fv) throws MalformedURLException,
+    private HttpURLConnection get(String base, FormValues fv) throws
             IOException {
         HttpURLConnection conn = open(base, fv);
         conn.setDoOutput(false);
@@ -366,7 +359,7 @@ private HttpURLConnection get(String base, FormValues fv) throws MalformedURLExc
         return conn;
     }
 
-    private HttpURLConnection post(String base, FormValues fv) throws MalformedURLException,
+    private HttpURLConnection post(String base, FormValues fv) throws
             IOException {
         HttpURLConnection conn = open(base, fv);
         conn.setDoOutput(true);
@@ -409,9 +402,9 @@ private void setWorkoutType(Sport s, String garminID) throws Exception {
         int responseCode = conn.getResponseCode();
         String amsg = conn.getResponseMessage();
         if (responseCode == HttpURLConnection.HTTP_OK) {
-            JSONObject reply = SyncHelper.parse(new BufferedReader(new InputStreamReader(
+            //JSONObject reply = SyncHelper.parse(new BufferedReader(new InputStreamReader(
+            //    conn.getInputStream())));
             // if "activityType" not in res or res["activityType"]["key"] != acttype:
-            conn.getInputStream())));
             conn.disconnect();
         } else {
             throw new Exception("Impossible to connect" + responseCode + amsg);
@@ -426,8 +419,8 @@ public Status upload(SQLiteDatabase db, long mID) {
         }
 
         TCX tcx = new TCX(db);
-        HttpURLConnection conn = null;
-        Exception ex = null;
+        HttpURLConnection conn;
+        Exception ex;
         try {
             StringWriter writer = new StringWriter();
             tcx.export(mID, writer);
@@ -437,7 +430,7 @@ public Status upload(SQLiteDatabase db, long mID) {
             conn.setRequestMethod(RequestMethod.POST.name());
             addCookies(conn);
 
-            Part<StringWritable> part2 = new Part<StringWritable>("data",
+            Part<StringWritable> part2 = new Part<>("data",
                     new StringWritable(writer.toString()));
             part2.setFilename("RunnerUp.tcx");
             part2.setContentType("application/octet-stream");
@@ -473,9 +466,7 @@ public Status upload(SQLiteDatabase db, long mID) {
 
         s = Synchronizer.Status.ERROR;
         s.ex = ex;
-        if (ex != null) {
-            ex.printStackTrace();
-        }
+        ex.printStackTrace();
         return s;
     }
 
@@ -525,14 +516,14 @@ public Status listWorkouts(List<Pair<String, String>> list) {
             return s;
         }
         // s = Status.OK
-        HttpURLConnection conn = null;
+        HttpURLConnection conn;
 
         try {
 
             Calendar today = Calendar.getInstance();
             int month = today.get(Calendar.MONTH); //jan = 0
-            String str_today = String.format("%1$tY-%1$tm-%1td", today);
-            String workout_url = String.format(CALENDAR_URL, today, month);
+            String str_today = String.format(Locale.ENGLISH, "%1$tY-%1$tm-%1td", today);
+            String workout_url = String.format(Locale.ENGLISH, CALENDAR_URL, today, month);
 
             conn = (HttpURLConnection) new URL(workout_url).openConnection();
             conn.setRequestMethod(RequestMethod.GET.name());
@@ -556,7 +547,7 @@ else if (!obj.getString("itemType").equals("workout"))
                     if (obj.optString("date").equals(str_today)) {
                         title = '*' + title; //mark workout scheduled for today
                     }
-                    list.add(new Pair<String, String>(getWorkoutIdFromSchedule(obj.getString("id")),
+                    list.add(new Pair<>(getWorkoutIdFromSchedule(obj.getString("id")),
                             title + ".json"));
                 }
             } else {
@@ -589,7 +580,7 @@ else if (!obj.getString("itemType").equals("workout"))
                     obj = arr.optJSONObject(i);
                     if (obj == null)
                         break;
-                    list.add(new Pair<String, String>(obj.getString("workoutId"), obj
+                    list.add(new Pair<>(obj.getString("workoutId"), obj
                             .getString("workoutName") + ".json"));
                 }
             } else {
@@ -613,7 +604,7 @@ else if (!obj.getString("itemType").equals("workout"))
     @Override
     public void downloadWorkout(File dst, String key) throws Exception {
         HttpURLConnection conn = null;
-        Exception ex = null;
+        Exception ex;
         FileOutputStream out = null;
         try {
             conn = (HttpURLConnection) new URL(GET_WORKOUT_URL + key).openConnection();
diff --git a/app/src/org/runnerup/export/GoogleFitSynchronizer.java b/app/src/org/runnerup/export/GoogleFitSynchronizer.java
index b5f65872f..92024d6ea 100644
--- a/app/src/org/runnerup/export/GoogleFitSynchronizer.java
+++ b/app/src/org/runnerup/export/GoogleFitSynchronizer.java
@@ -17,10 +17,8 @@
 
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.util.Log;
 
 import org.json.JSONArray;
@@ -39,7 +37,7 @@
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class GoogleFitSynchronizer extends GooglePlusSynchronizer {
 
     public static final String NAME = "GoogleFit";
@@ -65,7 +63,7 @@ public class GoogleFitSynchronizer extends GooglePlusSynchronizer {
     }
 
     @Override
-    public String getScopes() {
+    String getScopes() {
         return SCOPES;
     }
 
@@ -111,7 +109,7 @@ public Status upload(SQLiteDatabase db, long mID) {
 
         //export DataSource if not yet existing
         GoogleFitData gfd = new GoogleFitData(db, getProjectId(), getContext());
-        List<String> presentDataSources = null;
+        List<String> presentDataSources;
         try {
             presentDataSources = listExistingDataSources();
         } catch (Exception e) {
@@ -197,16 +195,16 @@ private Status sendData(StringWriter w, String suffix, RequestMethod method) thr
 
             int code = connect.getResponseCode();
             try {
-                if (code == HttpURLConnection.HTTP_INTERNAL_ERROR) {
-                    continue;
-                } else if (code != HttpURLConnection.HTTP_OK) {
-                    Log.i(getName(), SyncHelper.parse(new GZIPInputStream(connect.getErrorStream())).toString());
-                    status = Status.ERROR;
-                    break;
-                } else {
-                    Log.i(getName(), SyncHelper.parse(new GZIPInputStream(connect.getInputStream())).toString());
-                    status = Status.OK;
-                    break;
+                if (code != HttpURLConnection.HTTP_INTERNAL_ERROR) {
+                    if (code != HttpURLConnection.HTTP_OK) {
+                        Log.i(getName(), SyncHelper.parse(new GZIPInputStream(connect.getErrorStream())).toString());
+                        status = Status.ERROR;
+                        break;
+                    } else {
+                        Log.i(getName(), SyncHelper.parse(new GZIPInputStream(connect.getInputStream())).toString());
+                        status = Status.OK;
+                        break;
+                    }
                 }
             } catch (JSONException e) {
                 e.printStackTrace();
@@ -239,9 +237,9 @@ private HttpURLConnection getHttpURLConnection(String suffix, RequestMethod requ
         return connect;
     }
 
-    public List<String> listExistingDataSources() throws Exception {
-        HttpURLConnection conn = null;
-        List<String> dataStreamIds = new ArrayList<String>();
+    private List<String> listExistingDataSources() throws Exception {
+        HttpURLConnection conn;
+        List<String> dataStreamIds = new ArrayList<>();
         try {
             conn = getHttpURLConnection(REST_DATASOURCE, RequestMethod.GET);
             final JSONObject reply = SyncHelper.parse(new GZIPInputStream(conn.getInputStream()));
diff --git a/app/src/org/runnerup/export/GooglePlusSynchronizer.java b/app/src/org/runnerup/export/GooglePlusSynchronizer.java
index c8057c502..b18ab9014 100644
--- a/app/src/org/runnerup/export/GooglePlusSynchronizer.java
+++ b/app/src/org/runnerup/export/GooglePlusSynchronizer.java
@@ -17,12 +17,10 @@
 
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -41,7 +39,7 @@
 import java.net.ProtocolException;
 import java.net.URL;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class GooglePlusSynchronizer extends DefaultSynchronizer implements Synchronizer, OAuth2Server {
 
     public static final String NAME = "Google+";
@@ -50,33 +48,36 @@ public class GooglePlusSynchronizer extends DefaultSynchronizer implements Synch
     /**
      * @todo register OAuth2Server
      */
-    protected String mClientId = null;
-    protected String mClientSecret = null;
-    protected String projectId = null;
+    private String mClientId = null;
+    private String mClientSecret = null;
+    private String projectId = null;
 
-    protected String sAuthUrl = "https://accounts.google.com/o/oauth2/auth";
-    protected String sTokenUrl = "https://accounts.google.com/o/oauth2/token";
+    @SuppressWarnings("FieldCanBeLocal")
+    private final String sAuthUrl = "https://accounts.google.com/o/oauth2/auth";
+    @SuppressWarnings("FieldCanBeLocal")
+    private final String sTokenUrl = "https://accounts.google.com/o/oauth2/token";
 
-    protected String sRedirectUrl = "http://localhost";
+    @SuppressWarnings("FieldCanBeLocal")
+    private final String sRedirectUrl = "http://localhost";
 
     private static final String SCOPES = "https://www.googleapis.com/auth/plus.me " +
             "https://www.googleapis.com/auth/plus.login " +
             "https://www.googleapis.com/auth/plus.stream.write";
     private long id = 0;
 
-    public String getAccessToken() {
+    String getAccessToken() {
         return access_token;
     }
 
-    public String getRefreshToken() {
+    private String getRefreshToken() {
         return refresh_token;
     }
 
-    public long getTokenNow() {
+    private long getTokenNow() {
         return token_now;
     }
 
-    public long getExpireTime() {
+    private long getExpireTime() {
         return expire_time;
     }
 
@@ -107,11 +108,11 @@ private void setClientId(String clientId) {
         this.mClientId = clientId;
     }
 
-    public void setProjectId(String projectId) {
+    private void setProjectId(String projectId) {
         this.projectId = projectId;
     }
 
-    public String getProjectId() {
+    String getProjectId() {
         return projectId;
     }
 
@@ -139,7 +140,7 @@ public String getTokenUrl() {
         return sTokenUrl;
     }
 
-    public String getScopes() { return SCOPES; }
+    String getScopes() { return SCOPES; }
 
     @Override
     public String getAuthExtra() {
@@ -225,10 +226,7 @@ public Status getAuthResult(int resultCode, Intent data) {
 
     @Override
     public boolean isConfigured() {
-        if (access_token == null)
-            return false;
-
-        return true;
+        return access_token != null;
     }
 
     @Override
@@ -269,7 +267,7 @@ public void logout() {
 
     public Status refreshToken() {
         Status s = Status.OK;
-        HttpURLConnection conn = null;
+        HttpURLConnection conn;
 
         final FormValues fv = new FormValues();
         fv.put("client_id", getClientId());
@@ -308,8 +306,7 @@ public Status refreshToken() {
             s.ex = e;
         }
 
-        if (s.ex != null)
-            s.ex.printStackTrace();
+        s.ex.printStackTrace();
 
         return s;
     }
diff --git a/app/src/org/runnerup/export/JoggSESynchronizer.java b/app/src/org/runnerup/export/JoggSESynchronizer.java
index f06b30c1f..53aae290c 100644
--- a/app/src/org/runnerup/export/JoggSESynchronizer.java
+++ b/app/src/org/runnerup/export/JoggSESynchronizer.java
@@ -17,10 +17,8 @@
 
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.util.Base64;
 import android.util.Log;
 
@@ -52,7 +50,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class JoggSESynchronizer extends DefaultSynchronizer {
 
     public static final String NAME = "jogg.se";
@@ -60,9 +58,9 @@ public class JoggSESynchronizer extends DefaultSynchronizer {
     private static String MASTER_USER = null;
     private static String MASTER_KEY = null;
 
-    public static final String BASE_URL = "http://jogg.se/iphoneservice/iphoneservice.asmx";
+    private static final String BASE_URL = "http://jogg.se/iphoneservice/iphoneservice.asmx";
 
-    long id = 0;
+    private long id = 0;
     private String username = null;
     private String password = null;
     private boolean isConnected = false;
@@ -109,9 +107,7 @@ public void init(final ContentValues config) {
 
     @Override
     public boolean isConfigured() {
-        if (username != null && password != null)
-            return true;
-        return false;
+        return username != null && password != null;
     }
 
     @Override
@@ -146,10 +142,10 @@ public Status connect() {
             return s;
         }
 
-        Exception ex = null;
+        Exception ex;
         HttpURLConnection conn = null;
         try {
-            /**
+            /*
              * Login by making an empty save-gpx call and see what error message
              * you get Invalid/"Invalid Userdetails" => wrong user/pass
              * NOK/"Root element is missing" => OK
@@ -204,9 +200,7 @@ public Status connect() {
 
         s = Synchronizer.Status.ERROR;
         s.ex = ex;
-        if (ex != null) {
-            ex.printStackTrace();
-        }
+        ex.printStackTrace();
         return s;
     }
 
@@ -267,7 +261,7 @@ public Status upload(final SQLiteDatabase db, final long mID) {
             return s;
         }
 
-        Exception ex = null;
+        Exception ex;
         HttpURLConnection conn = null;
         final GPX gpx = new GPX(db);
         try {
@@ -330,9 +324,7 @@ public Status upload(final SQLiteDatabase db, final long mID) {
         s = Synchronizer.Status.ERROR;
         s.ex = ex;
         s.activityId = mID;
-        if (ex != null) {
-            ex.printStackTrace();
-        }
+        ex.printStackTrace();
         return s;
 
     }
diff --git a/app/src/org/runnerup/export/MapMyRunSynchronizer.java b/app/src/org/runnerup/export/MapMyRunSynchronizer.java
index cc0ec66c8..d75b2773d 100644
--- a/app/src/org/runnerup/export/MapMyRunSynchronizer.java
+++ b/app/src/org/runnerup/export/MapMyRunSynchronizer.java
@@ -17,12 +17,11 @@
 
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.util.Log;
 import android.util.Pair;
+import android.util.SparseArray;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -47,7 +46,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class MapMyRunSynchronizer extends DefaultSynchronizer {
 
     public static final String NAME = "MapMyRun";
@@ -58,23 +57,23 @@ public class MapMyRunSynchronizer extends DefaultSynchronizer {
     private static final String IMPORT_URL = BASE_URL + "/workouts/import_tcx";
     private static final String UPDATE_URL = BASE_URL + "/workouts/edit_workout";
 
-    long id = 0;
+    private long id = 0;
     private String username = null;
     private String password = null;
     private String md5pass = null;
     private String user_id = null;
     private String user_key = null;
 
-    static final Map<Integer, Sport> mapmyrun2sportMap = new HashMap<Integer, Sport>();
-    static final Map<Sport, Integer> sport2mapmyrunMap = new HashMap<Sport, Integer>();
+    private static final SparseArray<Sport> mapmyrun2sportMap = new SparseArray<>();
+    private static final Map<Sport, Integer> sport2mapmyrunMap = new HashMap<>();
     static {
         // V3 API (what we use): 16 is Walking (specifically a long walk)
         // V7 API is different: 11: Biking, 16: Running, 9: Walk
         // documentation can be found at http://www.mapmyrun.com/api/3.1/?doc
-        mapmyrun2sportMap.put(1, Sport.RUNNING);
-        mapmyrun2sportMap.put(3, Sport.BIKING);
-        for (Integer i : mapmyrun2sportMap.keySet()) {
-            sport2mapmyrunMap.put(mapmyrun2sportMap.get(i), i);
+        sport2mapmyrunMap.put(Sport.RUNNING, 1);
+        sport2mapmyrunMap.put(Sport.BIKING, 3);
+        for (Sport s : sport2mapmyrunMap.keySet()) {
+            mapmyrun2sportMap.put(sport2mapmyrunMap.get(s), s);
         }
     }
 
@@ -122,11 +121,8 @@ public void init(ContentValues config) {
 
     @Override
     public boolean isConfigured() {
-        if (username != null && md5pass != null &&
-                user_id != null && user_key != null) {
-            return true;
-        }
-        return false;
+        return username != null && md5pass != null &&
+                user_id != null && user_key != null;
     }
 
     @Override
@@ -178,7 +174,7 @@ public Status connect() {
             return s;
         }
 
-        Exception ex = null;
+        Exception ex;
         HttpURLConnection conn = null;
         try {
             String pass = md5pass;
@@ -186,7 +182,7 @@ public Status connect() {
                 pass = toHexString(Encryption.md5(password));
             }
 
-            /**
+            /*
              * get user id/key
              */
             conn = (HttpURLConnection) new URL(GET_USER_URL).openConnection();
@@ -235,9 +231,7 @@ public Status connect() {
             conn.disconnect();
 
         s.ex = ex;
-        if (ex != null) {
-            ex.printStackTrace();
-        }
+        ex.printStackTrace();
         return s;
     }
 
@@ -249,8 +243,8 @@ public Status upload(SQLiteDatabase db, long mID) {
         }
 
         TCX tcx = new TCX(db);
-        HttpURLConnection conn = null;
-        Exception ex = null;
+        HttpURLConnection conn;
+        Exception ex;
         try {
             StringWriter writer = new StringWriter();
             Pair<String, Sport> res = tcx.exportWithSport(mID, writer);
@@ -327,9 +321,7 @@ public Status upload(SQLiteDatabase db, long mID) {
         s = Synchronizer.Status.ERROR;
         s.ex = ex;
         s.activityId = mID;
-        if (ex != null) {
-            ex.printStackTrace();
-        }
+        ex.printStackTrace();
         return s;
     }
 
diff --git a/app/src/org/runnerup/export/NikePlusSynchronizer.java b/app/src/org/runnerup/export/NikePlusSynchronizer.java
index 133b9ba8e..b2fba8ec8 100644
--- a/app/src/org/runnerup/export/NikePlusSynchronizer.java
+++ b/app/src/org/runnerup/export/NikePlusSynchronizer.java
@@ -17,10 +17,8 @@
 
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.util.Log;
 
 import org.json.JSONArray;
@@ -48,7 +46,6 @@
 import java.io.OutputStream;
 import java.io.StringWriter;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.text.SimpleDateFormat;
@@ -57,7 +54,7 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class NikePlusSynchronizer extends DefaultSynchronizer {
 
     public static final String NAME = "Nike+";
@@ -80,7 +77,7 @@ public class NikePlusSynchronizer extends DefaultSynchronizer {
             + "/v1.0/me/home/feed?access_token=%s&start=%d&count=%d";
     private static final String FRIEND_FEED_URL = BASE_URL
             + "/v1.0/me/friends/feed?access_token=%s&startIndex=%d&count=%d";
-    long id = 0;
+    private long id = 0;
     private String username = null;
     private String password = null;
     private String access_token = null;
@@ -129,10 +126,7 @@ public void init(ContentValues config) {
 
     @Override
     public boolean isConfigured() {
-        if (username != null && password != null) {
-            return true;
-        }
-        return false;
+        return username != null && password != null;
     }
 
     @Override
@@ -177,7 +171,7 @@ public Status connect() {
 
         HttpURLConnection conn = null;
         try {
-            /**
+            /*
              * get user id/key
              */
             String url = String.format(LOGIN_URL, CLIENT_ID, CLIENT_SECRET, APP_ID);
@@ -241,8 +235,8 @@ public Status upload(SQLiteDatabase db, long mID) {
 
         NikeXML nikeXML = new NikeXML(db);
         GPX nikeGPX = new GPX(db);
-        HttpURLConnection conn = null;
-        Exception ex = null;
+        HttpURLConnection conn;
+        Exception ex;
         try {
             StringWriter xml = new StringWriter();
             nikeXML.export(mID, xml);
@@ -256,13 +250,13 @@ public Status upload(SQLiteDatabase db, long mID) {
             conn.setRequestMethod(RequestMethod.POST.name());
             conn.addRequestProperty("user-agent", USER_AGENT);
             conn.addRequestProperty("appid", APP_ID);
-            Part<StringWritable> part1 = new Part<StringWritable>("runXML",
+            Part<StringWritable> part1 = new Part<>("runXML",
                     new StringWritable(xml.toString()));
             part1.setFilename("runXML.xml");
             part1.setContentType("text/plain; charset=US-ASCII");
             part1.setContentTransferEncoding("8bit");
 
-            Part<StringWritable> part2 = new Part<StringWritable>("gpxXML",
+            Part<StringWritable> part2 = new Part<>("gpxXML",
                     new StringWritable(gpx.toString()));
             part2.setFilename("gpxXML.xml");
             part2.setContentType("text/plain; charset=US-ASCII");
@@ -304,9 +298,7 @@ public Status upload(SQLiteDatabase db, long mID) {
         s = Synchronizer.Status.ERROR;
         s.ex = ex;
         s.activityId = mID;
-        if (ex != null) {
-            ex.printStackTrace();
-        }
+        ex.printStackTrace();
         return s;
     }
 
@@ -327,8 +319,8 @@ public boolean checkSupport(Synchronizer.Feature f) {
 
     @Override
     public Status getFeed(FeedUpdater feedUpdater) {
-        Status s;
-        if ((s = connect()) != Status.OK) {
+        Status s = connect();
+        if (s != Status.OK) {
             return s;
         }
 
@@ -336,18 +328,17 @@ public Status getFeed(FeedUpdater feedUpdater) {
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'",
                     Locale.getDefault());
             df.setTimeZone(TimeZone.getTimeZone("UTC"));
-            List<ContentValues> result = new ArrayList<ContentValues>();
+            List<ContentValues> result = new ArrayList<>();
             getOwnFeed(df, result);
             getFriendsFeed(df, result);
             FeedList.sort(result);
             feedUpdater.addAll(result);
             return Status.OK;
         } finally {
-
         }
     }
 
-    JSONObject makeGetRequest(String url) throws MalformedURLException, IOException, JSONException {
+    private JSONObject makeGetRequest(String url) throws IOException, JSONException {
         HttpURLConnection conn = null;
         try {
             conn = (HttpURLConnection) new URL(url).openConnection();
@@ -368,6 +359,7 @@ JSONObject makeGetRequest(String url) throws MalformedURLException, IOException,
         return new JSONObject();
     }
 
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     private boolean parsePayload(ContentValues c, JSONObject p) throws NumberFormatException,
             JSONException {
         long duration = Long.parseLong(p.getString("duration")) / 1000;
@@ -391,7 +383,7 @@ private void getOwnFeed(SimpleDateFormat df, List<ContentValues> result) {
             String first = profile.getString("firstName");
             String last = profile.getString("lastName");
             String userUrl = profile.has("avatarFullUrl") ? profile.getString("avatarFullUrl") : null;
-            JSONObject feed = makeGetRequest(String.format(MY_FEED_URL, access_token, 1, 25));
+            JSONObject feed = makeGetRequest(String.format(Locale.ENGLISH, MY_FEED_URL, access_token, 1, 25));
             JSONArray arr = feed.getJSONArray("events");
             for (int i = 0; i < arr.length(); i++) {
                 JSONObject e = arr.getJSONObject(i);
@@ -432,7 +424,7 @@ private void getOwnFeed(SimpleDateFormat df, List<ContentValues> result) {
 
     private void getFriendsFeed(SimpleDateFormat df, List<ContentValues> result) {
         try {
-            JSONObject feed = makeGetRequest(String.format(FRIEND_FEED_URL, access_token, 1, 25));
+            JSONObject feed = makeGetRequest(String.format(Locale.ENGLISH, FRIEND_FEED_URL, access_token, 1, 25));
 
             if (!feed.has("friends")) {
                 Log.i(getClass().getSimpleName(), "No friends found, skipping their feed...");
diff --git a/app/src/org/runnerup/export/RunKeeperSynchronizer.java b/app/src/org/runnerup/export/RunKeeperSynchronizer.java
index 78f025a8b..2243fb7b3 100644
--- a/app/src/org/runnerup/export/RunKeeperSynchronizer.java
+++ b/app/src/org/runnerup/export/RunKeeperSynchronizer.java
@@ -17,7 +17,7 @@
 
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Context;
@@ -26,7 +26,6 @@
 import android.content.res.Resources;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
@@ -62,11 +61,11 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class RunKeeperSynchronizer extends DefaultSynchronizer implements Synchronizer, OAuth2Server {
 
     public static final String NAME = "RunKeeper";
-    public static final String PUBLIC_URL = "http://runkeeper.com";
+    private static final String PUBLIC_URL = "http://runkeeper.com";
     private Context context = null;
     /**
      * @todo register OAuth2Server
@@ -85,11 +84,11 @@ public class RunKeeperSynchronizer extends DefaultSynchronizer implements Synchr
     private String fitnessActivitiesUrl = null;
     private String userName = null;
 
-    public static final Map<String, Sport> runkeeper2sportMap = new HashMap<String, Sport>();
-    public static final Map<Sport, String> sport2runkeeperMap = new HashMap<Sport, String>();
+    public static final Map<String, Sport> runkeeper2sportMap = new HashMap<>();
+    public static final Map<Sport, String> sport2runkeeperMap = new HashMap<>();
     static {
         //sports list can be found at http://developer.runkeeper.com/healthgraph/fitness-activities#past
-        /**
+        /*
          * Running, Cycling, Mountain Biking, Walking, Hiking, Downhill Skiing, Cross-Country Skiing,
          * Snowboarding, Skating, Swimming, Wheelchair, Rowing, Elliptical, Other, Yoga, Pilates,
          * CrossFit, Spinning, Zumba, Barre, Group Workout, Dance, Bootcamp, Boxing / MMA, Meditation,
@@ -108,7 +107,7 @@ public class RunKeeperSynchronizer extends DefaultSynchronizer implements Synchr
         }
     }
 
-    public static final Map<String, Integer> POINT_TYPE = new HashMap<String, Integer>();
+    public static final Map<String, Integer> POINT_TYPE = new HashMap<>();
     static {
         POINT_TYPE.put("start", DB.LOCATION.TYPE_START);
         POINT_TYPE.put("end", DB.LOCATION.TYPE_END);
@@ -118,7 +117,7 @@ public class RunKeeperSynchronizer extends DefaultSynchronizer implements Synchr
         POINT_TYPE.put("manual", DB.LOCATION.TYPE_GPS);
     }
 
-    public RunKeeperSynchronizer(SyncManager syncManager) {
+    RunKeeperSynchronizer(SyncManager syncManager) {
         if (CLIENT_ID == null || CLIENT_SECRET == null) {
             try {
                 JSONObject tmp = new JSONObject(syncManager.loadData(this));
@@ -248,7 +247,7 @@ public Status connect() {
             return Synchronizer.Status.OK;
         }
 
-        /**
+        /*
          * Get the fitnessActivities end-point
          */
         String uri = null;
@@ -382,7 +381,7 @@ public Status upload(SQLiteDatabase db, final long mID) {
             return s;
         }
 
-        /**
+        /*
          * Get the fitnessActivities end-point
          */
         HttpURLConnection conn = null;
@@ -420,9 +419,7 @@ public Status upload(SQLiteDatabase db, final long mID) {
             ex = e;
         }
 
-        if (ex != null) {
-            Log.e(getName(), "Failed to upload: " + ex.getMessage());
-        }
+        Log.e(getName(), "Failed to upload: " + ex.getMessage());
 
         if (conn != null) {
             conn.disconnect();
@@ -433,6 +430,7 @@ public Status upload(SQLiteDatabase db, final long mID) {
         return s;
     }
 
+    @SuppressLint("StaticFieldLeak")
     @Override
     public String getActivityUrl(String extId) {
         //username is part of the "web" URL but is not directly accessible in the API
@@ -456,8 +454,7 @@ protected String doInBackground(Void... args) {
                             conn.disconnect();
 
                             String uri = obj.getString("profile");
-                            String user = uri.substring(uri.lastIndexOf("/") + 1);
-                            return user;
+                            return uri.substring(uri.lastIndexOf("/") + 1);
                         } catch (Exception e) {
                         }
                         return null;
@@ -497,7 +494,7 @@ public ActivityEntity download(SyncActivityItem item) {
             return null;
         }
 
-        HttpURLConnection conn = null;
+        HttpURLConnection conn;
         try {
             URL activityUrl = new URL(item.getURI());
             conn = (HttpURLConnection) activityUrl.openConnection();
diff --git a/app/src/org/runnerup/export/RunalyzeSynchronizer.java b/app/src/org/runnerup/export/RunalyzeSynchronizer.java
index 7d2a5a451..b21b57e34 100644
--- a/app/src/org/runnerup/export/RunalyzeSynchronizer.java
+++ b/app/src/org/runnerup/export/RunalyzeSynchronizer.java
@@ -16,10 +16,8 @@
  */
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.util.Log;
 
 import org.json.JSONException;
@@ -47,7 +45,7 @@
 /**
  * Synchronizer for <em>Runalyze</em> server. See more info in the project <a href="https://runalyze.com/login.php">home page</a>.
  */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class RunalyzeSynchronizer extends DefaultSynchronizer {
 
     /**
@@ -58,25 +56,16 @@ public class RunalyzeSynchronizer extends DefaultSynchronizer {
     /**
      * Public https url for runalyze.
      */
-    public static final String PUBLIC_URL = "https://runalyze.com";
+    private static final String PUBLIC_URL = "https://runalyze.com";
 
     private long _id;
     private String _password;
     private String _username;
-    private String _url;
+    private String _url = PUBLIC_URL;
     private boolean _version3;
     private String _csrf_token;
-    private Map<String,Map<String,String>> _sports;
-    private Map<String,Map<String,String>> _types;
-
-    /**
-     * Empty constructor.
-     */
-    public RunalyzeSynchronizer() {
-        _url = PUBLIC_URL;
-        _sports = new HashMap<>();
-        _types = new HashMap<>();
-    }
+    private Map<String,Map<String,String>> _sports = new HashMap<>();
+    private Map<String,Map<String,String>> _types = new HashMap<>();
 
     @Override
     public int getIconId() {return R.drawable.a17_runalyze;}
@@ -185,7 +174,7 @@ public String getAuthConfig() {
      * @return The string with the
      * @throws IOException
      */
-    protected String getResponse(InputStream is) throws IOException {
+    private String getResponse(InputStream is) throws IOException {
         String result = null;
         BufferedInputStream input = null;
         ByteArrayOutputStream output = null;
@@ -223,7 +212,7 @@ protected String getResponse(InputStream is) throws IOException {
      * last one should be kept. Original method stores (and then sends) the two of them.
      * @param conn The connection after the login was made
      */
-    protected void getCookies(HttpURLConnection conn) {
+    void getCookies(HttpURLConnection conn) {
         Map<String, List<String>> headers = conn.getHeaderFields();
         Map<String, String> tmpCookies = new HashMap<>();
         for (Map.Entry<String, List<String>> e : headers.entrySet()) {
@@ -247,7 +236,7 @@ protected void getCookies(HttpURLConnection conn) {
         Log.v(getName(), "cookies=" + cookies);
     }
 
-    protected void getCSRFToken(String response) {
+    private void getCSRFToken(String response) {
         Pattern pattern = Pattern.compile("<input type=\"hidden\" name=\"_csrf_token\" value=\"([^\"]+)\">");
         Matcher matcher = pattern.matcher(response);
         if (matcher.find()) {
@@ -264,7 +253,7 @@ protected void getCSRFToken(String response) {
          * let us to know it is a 2.x.
          * @return The return code or -1 in case of strange error
          */
-    protected int prepareLogin() {
+        private int prepareLogin() {
         try {
             URL url = new URL(_url + "/en/login");
             //Log.v(getName(), "URL=" + url);
@@ -296,7 +285,7 @@ protected int prepareLogin() {
      * Method that performs a silent login in runalyze and save the cookies for later use.
      * @return The status
      */
-    protected Status login() {
+    private Status login() {
         OutputStreamWriter writer = null;
         try {
             Log.v(getName(), "Login enter");
@@ -354,7 +343,7 @@ protected Status login() {
      * @param selectName The select name to search for
      * @return The string of the select or null
      */
-    protected String obtainSelect(String page, String selectName) {
+    private String obtainSelect(String page, String selectName) {
         // find the start of the
         Pattern selectStart = Pattern.compile("<[Ss][Ee][Ll][Ee][Cc][Tt] [^>]*[Nn][Aa][Mm][Ee]\\s*=\\s*[\"']" + selectName + "[\"'][^>]*>");
         Pattern selectEnd = Pattern.compile("</[Ss][Ee][Ll][Ee][Cc][Tt]>");
@@ -376,7 +365,7 @@ protected String obtainSelect(String page, String selectName) {
      * @param option The html option to parse
      * @return The map of attributes in the option tag
      */
-    protected Map<String,String> parseOption(String option) {
+    private Map<String,String> parseOption(String option) {
         Map<String,String> options = new HashMap<>();
         Pattern pattern = Pattern.compile("([\\w-_]+)\\s*=\\s*(\"[^\"]*\"|\'[^\']*\')");
         Matcher matcher = pattern.matcher(option);
@@ -393,7 +382,7 @@ protected Map<String,String> parseOption(String option) {
      * @param option The html option tag
      * @return The name in the option
      */
-    protected String obtainName(String option) {
+    private String obtainName(String option) {
         Pattern pattern = Pattern.compile(">([^<]+)<");
         Matcher matcher = pattern.matcher(option);
         if (matcher.find()) {
@@ -410,7 +399,7 @@ protected String obtainName(String option) {
      * @param selectName The name of the select to search for
      * @return A map with all the values in the options
      */
-    protected Map<String,Map<String,String>> parseSelect(String page, String selectName) {
+    private Map<String,Map<String,String>> parseSelect(String page, String selectName) {
         Map<String,Map<String,String>> map = new HashMap<>();
         String select = obtainSelect(page, selectName);
         if (select != null) {
@@ -440,7 +429,7 @@ protected Map<String,Map<String,String>> parseSelect(String page, String selectN
      * and types defined in runalyze by the user. If no one is defined a default sportid will
      * be sent.
      */
-    protected void doAdd() {
+    private void doAdd() {
         try {
             URL add = new URL(_url + "/activity/add");
             HttpURLConnection conn = (HttpURLConnection) add.openConnection();
diff --git a/app/src/org/runnerup/export/RunnerUpLiveSynchronizer.java b/app/src/org/runnerup/export/RunnerUpLiveSynchronizer.java
index 983ac6e32..9ec0fc3b2 100644
--- a/app/src/org/runnerup/export/RunnerUpLiveSynchronizer.java
+++ b/app/src/org/runnerup/export/RunnerUpLiveSynchronizer.java
@@ -17,7 +17,6 @@
 
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
 import android.app.IntentService;
 import android.content.ContentValues;
 import android.content.Context;
@@ -25,7 +24,6 @@
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.location.Location;
-import android.os.Build;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
@@ -45,7 +43,7 @@
 import org.runnerup.workout.Scope;
 import org.runnerup.workout.WorkoutInfo;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class RunnerUpLiveSynchronizer extends DefaultSynchronizer implements WorkoutObserver {
 
     public static final String NAME = "RunnerUp LIVE";
diff --git a/app/src/org/runnerup/export/RunningAHEADSynchronizer.java b/app/src/org/runnerup/export/RunningAHEADSynchronizer.java
index a73e25ba0..75f3fcb39 100644
--- a/app/src/org/runnerup/export/RunningAHEADSynchronizer.java
+++ b/app/src/org/runnerup/export/RunningAHEADSynchronizer.java
@@ -17,12 +17,10 @@
 
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.util.Log;
 
 import org.json.JSONException;
@@ -44,7 +42,7 @@
 import java.net.URL;
 import java.util.zip.GZIPOutputStream;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class RunningAHEADSynchronizer extends DefaultSynchronizer implements OAuth2Server {
 
     public static final String NAME = "RunningAHEAD";
@@ -53,15 +51,15 @@ public class RunningAHEADSynchronizer extends DefaultSynchronizer implements OAu
     /**
      * @todo register OAuth2Server
      */
-    public static String CLIENT_ID = null;
-    public static String CLIENT_SECRET = null;
+    private static String CLIENT_ID = null;
+    private static String CLIENT_SECRET = null;
 
-    public static final String AUTH_URL = "https://www.runningahead.com/oauth2/authorize";
-    public static final String TOKEN_URL = "https://api.runningahead.com/oauth2/token";
-    public static final String REDIRECT_URI = "http://localhost:8080/runnerup/runningahead";
+    private static final String AUTH_URL = "https://www.runningahead.com/oauth2/authorize";
+    private static final String TOKEN_URL = "https://api.runningahead.com/oauth2/token";
+    private static final String REDIRECT_URI = "http://localhost:8080/runnerup/runningahead";
 
-    public static final String REST_URL = "https://api.runningahead.com/rest";
-    public static final String IMPORT_URL = REST_URL + "/logs/me/workouts/tcx";
+    private static final String REST_URL = "https://api.runningahead.com/rest";
+    private static final String IMPORT_URL = REST_URL + "/logs/me/workouts/tcx";
 
     private long id = 0;
     private String access_token = null;
@@ -174,9 +172,7 @@ public Status getAuthResult(int resultCode, Intent data) {
 
     @Override
     public boolean isConfigured() {
-        if (access_token == null)
-            return false;
-        return true;
+        return access_token != null;
     }
 
     @Override
@@ -203,8 +199,8 @@ public Status upload(SQLiteDatabase db, final long mID) {
 
         String URL = IMPORT_URL + "?access_token=" + access_token;
         TCX tcx = new TCX(db);
-        HttpURLConnection conn = null;
-        Exception ex = null;
+        HttpURLConnection conn;
+        Exception ex;
         try {
             StringWriter writer = new StringWriter();
             tcx.export(mID, writer);
@@ -226,13 +222,13 @@ public Status upload(SQLiteDatabase db, final long mID) {
             JSONObject data = obj.getJSONObject("data");
 
             boolean found = false;
-            if (found == false) {
+            //if (!found) {
                 try {
                     found = data.getJSONArray("workoutIds").length() == 1;
                 } catch (JSONException e) {
                 }
-            }
-            if (found == false) {
+            //}
+            if (!found) {
                 try {
                     found = data.getJSONArray("ids").length() == 1;
                 } catch (JSONException e) {
@@ -254,9 +250,7 @@ public Status upload(SQLiteDatabase db, final long mID) {
 
         s = Synchronizer.Status.ERROR;
         s.ex = ex;
-        if (ex != null) {
-            ex.printStackTrace();
-        }
+        ex.printStackTrace();
         return s;
     }
 
diff --git a/app/src/org/runnerup/export/RunningFreeOnlineSynchronizer.java b/app/src/org/runnerup/export/RunningFreeOnlineSynchronizer.java
index 9c25ed76a..b48334581 100644
--- a/app/src/org/runnerup/export/RunningFreeOnlineSynchronizer.java
+++ b/app/src/org/runnerup/export/RunningFreeOnlineSynchronizer.java
@@ -275,7 +275,7 @@ private HttpURLConnection createHttpURLConnection() throws IOException {
         return conn;
     }
 
-    public static byte[] gzip(String string) throws IOException {
+    private static byte[] gzip(String string) throws IOException {
         ByteArrayOutputStream os = new ByteArrayOutputStream(string.length());
         GZIPOutputStream gos = new GZIPOutputStream(os);
         gos.write(string.getBytes());
diff --git a/app/src/org/runnerup/export/RuntasticSynchronizer.java b/app/src/org/runnerup/export/RuntasticSynchronizer.java
index 839ad0c75..c1e4318fd 100644
--- a/app/src/org/runnerup/export/RuntasticSynchronizer.java
+++ b/app/src/org/runnerup/export/RuntasticSynchronizer.java
@@ -17,13 +17,12 @@
 
 package org.runnerup.export;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.util.Log;
 import android.util.Pair;
 import android.util.Patterns;
+import android.util.SparseArray;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -44,10 +43,11 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class RuntasticSynchronizer extends DefaultSynchronizer {
 
     public static final String NAME = "Runtastic";
@@ -58,27 +58,24 @@ public class RuntasticSynchronizer extends DefaultSynchronizer {
     private static final String UPLOAD_URL = BASE_URL + "/import/upload_session";
     private static final String UPDATE_SPORTS_TYPE = BASE_URL + "/import/update_sport_type";
 
-    long id = 0;
+    private long id = 0;
     private String username = null;
     private String password = null;
 
     private Integer userId = null;
     private String authToken = null;
 
-    static final Map<Integer, Sport> runtastic2sportMap = new HashMap<Integer, Sport>();
-    static final Map<Sport, Integer> sport2runtasticMap = new HashMap<Sport, Integer>();
+    private static final SparseArray<Sport> runtastic2sportMap = new SparseArray<>();
+    private static final Map<Sport, Integer> sport2runtasticMap = new HashMap<>();
     static {
-        runtastic2sportMap.put(1, Sport.RUNNING);
-        runtastic2sportMap.put(3, Sport.BIKING);
-        for (Integer i : runtastic2sportMap.keySet()) {
-            sport2runtasticMap.put(runtastic2sportMap.get(i), i);
+        sport2runtasticMap.put(Sport.RUNNING, 1);
+        sport2runtasticMap.put(Sport.BIKING, 3);
+        for (Sport s : sport2runtasticMap.keySet()) {
+            runtastic2sportMap.put(sport2runtasticMap.get(s), s);
         }
     }
 
 
-    RuntasticSynchronizer(SyncManager syncManager) {
-    }
-
     @Override
     public long getId() {
         return id;
@@ -109,9 +106,7 @@ public void init(ContentValues config) {
 
     @Override
     public boolean isConfigured() {
-        if (username != null && password != null)
-            return true;
-        return false;
+        return username != null && password != null;
     }
 
     @Override
@@ -165,7 +160,7 @@ public Status connect() {
         cookies.clear();
 
         try {
-            /**
+            /*
              * connect to START_URL to get cookies/formValues
              */
             conn = (HttpURLConnection) new URL(START_URL).openConnection();
@@ -184,7 +179,7 @@ public Status connect() {
                 return Status.ERROR;
 
 
-            /**
+            /*
              * Then login using a post
              */
             FormValues kv = new FormValues();
@@ -226,7 +221,7 @@ public Status connect() {
                             else
                                 url2 = tmp;
 
-                            if (url2 != null)
+                            //if (url2 != null)
                                 break;
                         }
                     }
@@ -290,7 +285,7 @@ public Status upload(SQLiteDatabase db, long mID) {
         try {
             Pair<String, Sport> res = tcx.exportWithSport(mID, writer);
             Sport sport = res.second;
-            String filename = String.format("activity%s%d.tcx", Long.toString(Math.round(1000 * Math.random())), mID);
+            String filename = String.format(Locale.ENGLISH, "activity%s%d.tcx", Long.toString(Math.round(1000 * Math.random())), mID);
 
             String url = UPLOAD_URL + "?authenticity_token=" + SyncHelper.URLEncode(authToken) + "&qqfile=" +
                     filename;
@@ -361,8 +356,7 @@ public Status upload(SQLiteDatabase db, long mID) {
             s.ex = e;
         }
 
-        if (s.ex != null)
-            Log.e(getName(), "ex: " + s.ex);
+        Log.e(getName(), "ex: " + s.ex);
 
         if (conn != null)
             conn.disconnect();
diff --git a/app/src/org/runnerup/export/StravaSynchronizer.java b/app/src/org/runnerup/export/StravaSynchronizer.java
index 970e056ff..361f6b4a0 100644
--- a/app/src/org/runnerup/export/StravaSynchronizer.java
+++ b/app/src/org/runnerup/export/StravaSynchronizer.java
@@ -22,7 +22,6 @@
 import android.content.Intent;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.AsyncTask;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -54,7 +53,7 @@
 public class StravaSynchronizer extends DefaultSynchronizer implements OAuth2Server {
 
     public static final String NAME = "Strava";
-    public static final String PUBLIC_URL = "http://www.strava.com";
+    private static final String PUBLIC_URL = "http://www.strava.com";
 
     /**
      * @todo register OAuth2Server
@@ -333,7 +332,6 @@ public Status getExternalId(final SQLiteDatabase db, Status uploadStatus) {
                 amsg = conn.getResponseMessage();
 
                 final InputStream in = new BufferedInputStream(conn.getInputStream());
-                //Log.v(getName(), "code: " + responseCode + " " + conn.getURL() + ", amsg: " + amsg + in.toString());
                 json = SyncHelper.parse(in);
                 conn.disconnect();
 
diff --git a/app/src/org/runnerup/export/SyncManager.java b/app/src/org/runnerup/export/SyncManager.java
index 9cb2d90e3..495ae484e 100644
--- a/app/src/org/runnerup/export/SyncManager.java
+++ b/app/src/org/runnerup/export/SyncManager.java
@@ -18,7 +18,7 @@
 package org.runnerup.export;
 
 import android.Manifest;
-import android.annotation.TargetApi;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -77,7 +77,7 @@
 import java.util.Map;
 import java.util.Set;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class SyncManager {
     public static final int CONFIGURE_REQUEST = 1;
     public static final long ERROR_ACTIVITY_ID = -1L;
@@ -138,6 +138,7 @@ public void clear() {
         synchronizersById.clear();
     }
 
+    @SuppressWarnings("UnusedReturnValue")
     public long load(String synchronizerName) {
         String from[] = new String[] {
                 "_id", DB.ACCOUNT.NAME, DB.ACCOUNT.AUTH_CONFIG, DB.ACCOUNT.FLAGS
@@ -178,7 +179,7 @@ public Synchronizer add(ContentValues config) {
         if (synchronizerName.contentEquals(RunKeeperSynchronizer.NAME)) {
             synchronizer = new RunKeeperSynchronizer(this);
         } else if (synchronizerName.contentEquals(GarminSynchronizer.NAME)) {
-            synchronizer = new GarminSynchronizer(this);
+            synchronizer = new GarminSynchronizer();
         } else if (synchronizerName.contentEquals(FunBeatSynchronizer.NAME)) {
             synchronizer = new FunBeatSynchronizer(this);
         } else if (synchronizerName.contentEquals(MapMyRunSynchronizer.NAME)) {
@@ -188,13 +189,13 @@ public Synchronizer add(ContentValues config) {
         } else if (synchronizerName.contentEquals(JoggSESynchronizer.NAME)) {
             synchronizer = new JoggSESynchronizer(this);
         } else if (synchronizerName.contentEquals(EndomondoSynchronizer.NAME)) {
-            synchronizer = new EndomondoSynchronizer(this);
+            synchronizer = new EndomondoSynchronizer();
         } else if (synchronizerName.contentEquals(RunningAHEADSynchronizer.NAME)) {
             synchronizer = new RunningAHEADSynchronizer(this);
         } else if (synchronizerName.contentEquals(RunnerUpLiveSynchronizer.NAME)) {
             synchronizer = new RunnerUpLiveSynchronizer(mContext);
         } else if (synchronizerName.contentEquals(DigifitSynchronizer.NAME)) {
-            synchronizer = new DigifitSynchronizer(this);
+            synchronizer = new DigifitSynchronizer();
         } else if (synchronizerName.contentEquals(StravaSynchronizer.NAME)) {
             synchronizer = new StravaSynchronizer(this);
         } else if (synchronizerName.contentEquals(FacebookSynchronizer.NAME)) {
@@ -202,7 +203,7 @@ public Synchronizer add(ContentValues config) {
         } else if (synchronizerName.contentEquals(GooglePlusSynchronizer.NAME)) {
             synchronizer = new GooglePlusSynchronizer(this);
         } else if (synchronizerName.contentEquals(RuntasticSynchronizer.NAME)) {
-            synchronizer = new RuntasticSynchronizer(this);
+            synchronizer = new RuntasticSynchronizer();
         } else if (synchronizerName.contentEquals(GoogleFitSynchronizer.NAME)) {
             synchronizer = new GoogleFitSynchronizer(mContext, this);
         } else if (synchronizerName.contentEquals(RunningFreeOnlineSynchronizer.NAME)) {
@@ -271,7 +272,6 @@ public void run(String synchronizerName, Status status) {
                         callback.run(synchronizerName, status);
                     }
                 }, l, s.authMethod);
-                return;
         }
     }
 
@@ -311,7 +311,6 @@ private void handleAuth(Callback callback, final Synchronizer l, AuthMethod auth
             case FILEPERMISSION:
                 checkStoragePermissions(mActivity);
                 askFileUrl(l);
-                return;
         }
     }
 
@@ -341,7 +340,6 @@ private void handleAuthComplete(Synchronizer synchronizer, Status s) {
             }
             case NEED_AUTH:
                 handleAuth(cb, synchronizer, s.authMethod);
-                return;
         }
     }
 
@@ -438,6 +436,7 @@ public boolean onKey(DialogInterface dialogInterface, int i, KeyEvent keyEvent)
     }
 
 
+    @SuppressLint("StaticFieldLeak")
     private void testUserPass(final Synchronizer l, final JSONObject authConfig) {
         mSpinner.setTitle("Testing login " + l.getName());
 
@@ -541,6 +540,7 @@ public boolean onKey(DialogInterface dialogInterface, int i, KeyEvent keyEvent)
         dialog.show();
     }
 
+    @SuppressWarnings("UnusedReturnValue")
     private boolean checkStoragePermissions(final Activity activity) {
         boolean result = true;
         String[] requiredPerms;
@@ -594,6 +594,7 @@ private void nextSynchronizer() {
         doUpload(synchronizer);
     }
 
+    @SuppressLint("StaticFieldLeak")
     private void doUpload(final Synchronizer synchronizer) {
         final ProgressDialog copySpinner = mSpinner;
         final SQLiteDatabase copyDB = DBHelper.getWritableDatabase(mContext);
@@ -650,11 +651,9 @@ public void run(String synchronizerName,
                                         return;
                                     case OK:
                                         doUpload(synchronizer);
-                                        return;
                                 }
                             }
                         }, synchronizer, result.authMethod);
-                        return;
                 }
             }
         }.execute(synchronizer);
@@ -772,6 +771,7 @@ public void clearUpload(String name, long id) {
         }
     }
 
+    @SuppressLint("StaticFieldLeak")
     public void loadActivityList(final List<SyncActivityItem> items, final String synchronizerName, final Callback callback) {
         mSpinner.setTitle(getResources().getString(R.string.Loading_activities));
         mSpinner.setMessage(getResources().getString(R.string.Fetching_activities_from_1s, synchronizerName));
@@ -837,6 +837,7 @@ private void nextListWorkout() {
         doListWorkout(synchronizer);
     }
 
+    @SuppressLint("StaticFieldLeak")
     private void doListWorkout(final Synchronizer synchronizer) {
         final ProgressDialog copySpinner = mSpinner;
 
@@ -903,6 +904,7 @@ private void doneListing() {
             cb.run(null, Status.OK);
     }
 
+    @SuppressLint("StaticFieldLeak")
     public void loadWorkouts(final HashSet<WorkoutRef> pendingWorkouts, final Callback callback) {
         int cnt = pendingWorkouts.size();
         mSpinner.setTitle("Downloading workouts (" + cnt + ")");
@@ -961,6 +963,7 @@ protected void onPostExecute(Synchronizer.Status result) {
         }.execute("string");
     }
 
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     private static boolean compareFiles(File w, File f) {
         if (w.length() != f.length())
             return false;
@@ -1119,6 +1122,7 @@ private void syncNextActivity(final Synchronizer synchronizer, SyncMode mode) {
         doSyncMulti(synchronizer, mode, ai);
     }
 
+    @SuppressLint("StaticFieldLeak")
     private void doSyncMulti(final Synchronizer synchronizer, final SyncMode mode, final SyncActivityItem activityItem) {
         final ProgressDialog copySpinner = mSpinner;
         final SQLiteDatabase copyDB = DBHelper.getWritableDatabase(mContext);
@@ -1221,6 +1225,7 @@ private void nextSyncFeed() {
         syncFeed(synchronizer);
     }
 
+    @SuppressLint("StaticFieldLeak")
     private void syncFeed(final Synchronizer synchronizer) {
         if (synchronizer == null) {
             nextSyncFeed();
diff --git a/app/src/org/runnerup/export/Synchronizer.java b/app/src/org/runnerup/export/Synchronizer.java
index eab4bf5a7..7c2ee825f 100644
--- a/app/src/org/runnerup/export/Synchronizer.java
+++ b/app/src/org/runnerup/export/Synchronizer.java
@@ -146,7 +146,7 @@ enum Feature {
      * @param uploadStatus The status with the (temporary) identifier for the upload
      * @return the external ID
      */
-    public Status getExternalId(SQLiteDatabase db, Status uploadStatus);
+    Status getExternalId(SQLiteDatabase db, Status uploadStatus);
 
     /**
      * Check if an synchronizer supports a feature
@@ -216,5 +216,5 @@ enum Feature {
      * @param externalId
      * @return
      */
-    public String getActivityUrl(String externalId);
+    String getActivityUrl(String externalId);
 }
diff --git a/app/src/org/runnerup/export/format/EndomondoTrack.java b/app/src/org/runnerup/export/format/EndomondoTrack.java
index 4d96438b3..522830053 100644
--- a/app/src/org/runnerup/export/format/EndomondoTrack.java
+++ b/app/src/org/runnerup/export/format/EndomondoTrack.java
@@ -17,11 +17,9 @@
 
 package org.runnerup.export.format;
 
-import android.annotation.TargetApi;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.location.Location;
-import android.os.Build;
 
 import org.runnerup.common.util.Constants.DB;
 import org.runnerup.export.EndomondoSynchronizer;
@@ -38,12 +36,11 @@
  *
  */
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class EndomondoTrack {
 
-    long mID = 0;
-    SQLiteDatabase mDB = null;
-    SimpleDateFormat simpleDateFormat = null;
+    private SQLiteDatabase mDB = null;
+    private SimpleDateFormat simpleDateFormat = null;
 
     public EndomondoTrack(final SQLiteDatabase db) {
         mDB = db;
diff --git a/app/src/org/runnerup/export/format/FacebookCourse.java b/app/src/org/runnerup/export/format/FacebookCourse.java
index be5814647..c27d83397 100644
--- a/app/src/org/runnerup/export/format/FacebookCourse.java
+++ b/app/src/org/runnerup/export/format/FacebookCourse.java
@@ -17,12 +17,10 @@
 
 package org.runnerup.export.format;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.location.Location;
-import android.os.Build;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -30,7 +28,6 @@
 import org.runnerup.common.util.Constants.DB;
 import org.runnerup.util.Formatter;
 
-import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -39,13 +36,12 @@
  * @author jonas.oreland@gmail.com
  */
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class FacebookCourse {
 
-    long mID = 0;
-    SQLiteDatabase mDB = null;
-    Formatter formatter = null;
-    final SimpleDateFormat dateFormat = new SimpleDateFormat(
+    private SQLiteDatabase mDB = null;
+    private Formatter formatter = null;
+    private final SimpleDateFormat dateFormat = new SimpleDateFormat(
             "yyyy-MM-dd HH:mm:ss.SSSZ", Locale.getDefault());
 
     public FacebookCourse(Context ctx, SQLiteDatabase db) {
@@ -53,17 +49,17 @@ public FacebookCourse(Context ctx, SQLiteDatabase db) {
         formatter = new Formatter(ctx);
     }
 
-    String formatTime(long time) {
+    private String formatTime(long time) {
         return dateFormat.format(new Date(time));
     }
 
-    JSONObject pace(double distance, double duration) throws JSONException {
+    private JSONObject pace(double distance, double duration) throws JSONException {
         if (distance != 0)
             return pace(duration / distance);
         return null;
     }
 
-    JSONObject pace(double val) throws JSONException {
+    private JSONObject pace(double val) throws JSONException {
         if (formatter.getUnitMeters() == Formatter.km_meters) {
             return new JSONObject().put("value", val).put("units", "s/m");
         } else {
@@ -72,7 +68,7 @@ JSONObject pace(double val) throws JSONException {
     }
 
     public JSONObject export(long activityId, boolean showTrail, JSONObject runObj)
-            throws IOException, JSONException {
+            throws JSONException {
 
         final String[] aColumns = {
                 DB.ACTIVITY.NAME, DB.ACTIVITY.COMMENT,
diff --git a/app/src/org/runnerup/export/format/GPX.java b/app/src/org/runnerup/export/format/GPX.java
index 0bf4dab6c..0d438bb9f 100644
--- a/app/src/org/runnerup/export/format/GPX.java
+++ b/app/src/org/runnerup/export/format/GPX.java
@@ -17,10 +17,8 @@
 
 package org.runnerup.export.format;
 
-import android.annotation.TargetApi;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 
 import org.runnerup.common.util.Constants.DB;
 import org.runnerup.util.KXmlSerializer;
@@ -33,23 +31,19 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
-public class GPX {
 
-    final boolean export_rest_laps = false;
+public class GPX {
 
     enum RestLapMode {
         EMPTY_TRKSEG,
         START_STOP_TRKSEG
     }
 
-    final RestLapMode restLapMode = RestLapMode.START_STOP_TRKSEG;
+    private final RestLapMode restLapMode = RestLapMode.START_STOP_TRKSEG;
 
-    long mID = 0;
-    SQLiteDatabase mDB = null;
-    KXmlSerializer mXML = null;
-    String notes = null;
-    SimpleDateFormat simpleDateFormat = null;
+    private SQLiteDatabase mDB = null;
+    private KXmlSerializer mXML = null;
+    private SimpleDateFormat simpleDateFormat = null;
     final private boolean mGarminExt; //Also Cluetrust
     private final boolean mAccuracyExtensions;
 
@@ -65,7 +59,7 @@ public GPX(SQLiteDatabase mDB, boolean garminExt, boolean accuracyExtensions) {
         this.mAccuracyExtensions = accuracyExtensions;
     }
 
-    String formatTime(long time) {
+    private String formatTime(long time) {
         return simpleDateFormat.format(new Date(time));
     }
 
@@ -74,7 +68,7 @@ String formatTime(long time) {
      * @param writer
      * @throws IOException
      */
-    public String export(long activityId, Writer writer) throws IOException {
+    public void export(long activityId, Writer writer) throws IOException {
 
         String[] aColumns = {
                 DB.ACTIVITY.NAME, DB.ACTIVITY.COMMENT,
@@ -132,7 +126,7 @@ public String export(long activityId, Writer writer) throws IOException {
             mXML.text("RunnerUp-"+sportName+"-"+time);
             mXML.endTag("", "name");
             if (!cursor.isNull(1)) {
-                notes = cursor.getString(1);
+                String notes = cursor.getString(1);
                 mXML.startTag("", "desc");
                 mXML.text(notes);
                 mXML.endTag("", "desc");
@@ -145,7 +139,6 @@ public String export(long activityId, Writer writer) throws IOException {
             mXML.endDocument();
             mXML = null;
             cursor.close();
-            return time;
         } catch (IOException e) {
             cursor.close();
             mXML = null;
@@ -177,6 +170,7 @@ private void exportLaps(long activityId, long startTime) throws IOException {
         boolean pok = cLocation.moveToFirst();
 
         while (lok) {
+            final boolean export_rest_laps = false;
             if (cLap.getFloat(1) != 0 && cLap.getLong(2) != 0) {
                 long lap = cLap.getLong(0);
                 while (pok && cLocation.getLong(0) != lap) {
@@ -312,7 +306,8 @@ else if (cLocation.isNull(4)) {
                     }
                 }
                 mXML.endTag("", "trkseg");
-            } else if (export_rest_laps && (cLap.getFloat(1) != 0 || cLap.getLong(2) != 0)) {
+            } else //noinspection PointlessBooleanExpression,ConstantConditions
+                if (export_rest_laps && (cLap.getFloat(1) != 0 || cLap.getLong(2) != 0)) {
                 long lap = cLap.getLong(0);
                 if (restLapMode == RestLapMode.START_STOP_TRKSEG) {
                     if (lap > 0 && !cLap.isLast()) {
@@ -380,7 +375,9 @@ else if (cLocation.isNull(4)) {
         cLocation.close();
     }
 
-    public String getNotes() {
-        return notes;
-    }
+// --Commented out by Inspection START (2017-08-11 13:06):
+//    public String getNotes() {
+//        return notes;
+//    }
+// --Commented out by Inspection STOP (2017-08-11 13:06)
 }
diff --git a/app/src/org/runnerup/export/format/GoogleFitData.java b/app/src/org/runnerup/export/format/GoogleFitData.java
index ff83b6fc5..6a48d6aa0 100644
--- a/app/src/org/runnerup/export/format/GoogleFitData.java
+++ b/app/src/org/runnerup/export/format/GoogleFitData.java
@@ -17,11 +17,10 @@
 
 package org.runnerup.export.format;
 
-import android.annotation.TargetApi;
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.util.Log;
 import android.util.Pair;
 
@@ -44,12 +43,12 @@
 
 import static org.runnerup.common.util.Constants.DB;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class GoogleFitData {
 
-    public static final int SECONDS_TO_MILLIS = 1000;
-    public static final int MICRO_TO_NANOS = 1000000;
-    public static final int SECONDS_TO_NANOS = 1000000000;
+    private static final int SECONDS_TO_MILLIS = 1000;
+    private static final int MICRO_TO_NANOS = 1000000;
+    private static final int SECONDS_TO_NANOS = 1000000000;
     private static final Map<Sport, Integer> ACTIVITY_TYPE;
     static {
         Map<Sport, Integer> aMap = new HashMap<>();
@@ -63,50 +62,50 @@ public class GoogleFitData {
     }
     private static final Map<DataSourceType, List<DataTypeField>> DATA_TYPE_FIELDS;
     static {
-        Map<DataSourceType, List<DataTypeField>> fieldsMap = new HashMap<DataSourceType, List<DataTypeField>>();
+        Map<DataSourceType, List<DataTypeField>> fieldsMap = new HashMap<>();
 
-        List<DataTypeField> fields = new ArrayList<DataTypeField>();
+        List<DataTypeField> fields = new ArrayList<>();
         Pair<String, String> floatPoint = Pair.create("floatPoint", "fpVal");
         Pair<String, String> integer = Pair.create("integer", "intVal");
 
         fields.add(new DataTypeField("activity", integer, DB.ACTIVITY.SPORT));
         fieldsMap.put(DataSourceType.ACTIVITY_SEGMENT, fields);
 
-        fields = new ArrayList<DataTypeField>();
+        fields = new ArrayList<>();
         fields.add(new DataTypeField("bpm", floatPoint, DB.LOCATION.HR));
         fieldsMap.put(DataSourceType.ACTIVITY_HEARTRATE, fields);
 
-        fields = new ArrayList<DataTypeField>();
+        fields = new ArrayList<>();
         fields.add(new DataTypeField("latitude", floatPoint, DB.LOCATION.LATITUDE));
         fields.add(new DataTypeField("longitude", floatPoint, DB.LOCATION.LONGITUDE));
         fields.add(new DataTypeField("accuracy", floatPoint, DB.LOCATION.ACCURANCY));
         fields.add(new DataTypeField("altitude", floatPoint, DB.LOCATION.ALTITUDE));
         fieldsMap.put(DataSourceType.ACTIVITY_LOCATION, fields);
 
-        fields = new ArrayList<DataTypeField>();
+        fields = new ArrayList<>();
         fields.add(new DataTypeField("speed", floatPoint, DB.LOCATION.SPEED));
         fieldsMap.put(DataSourceType.ACTIVITY_SPEED, fields);
 
-        fields = new ArrayList<DataTypeField>();
+        fields = new ArrayList<>();
         fields.add(new DataTypeField("activity", integer, DB.ACTIVITY.SPORT));
         fields.add(new DataTypeField("duration", integer, DB.ACTIVITY.TIME));
         fields.add(new DataTypeField("num_segments", integer, "1"));
         fieldsMap.put(DataSourceType.ACTIVITY_SUMMARY, fields);
 
-        fields = new ArrayList<DataTypeField>();
+        fields = new ArrayList<>();
         fields.add(new DataTypeField("average", floatPoint, "AVG(" + DB.LOCATION.HR + ")"));
         fields.add(new DataTypeField("max", floatPoint, "MAX(" + DB.LOCATION.HR + ")"));
         fields.add(new DataTypeField("min", floatPoint, "MIN(" + DB.LOCATION.HR + ")"));
         fieldsMap.put(DataSourceType.HEARTRATE_SUMMARY, fields);
 
-        fields = new ArrayList<DataTypeField>();
+        fields = new ArrayList<>();
         fields.add(new DataTypeField("low_latitude", floatPoint, "MIN(" + DB.LOCATION.LATITUDE + ")"));
         fields.add(new DataTypeField("high_latitude", floatPoint, "MAX(" + DB.LOCATION.LATITUDE + ")"));
         fields.add(new DataTypeField("low_longitude", floatPoint, "MIN(" + DB.LOCATION.LONGITUDE + ")"));
         fields.add(new DataTypeField("high_longitude", floatPoint, "MAX(" + DB.LOCATION.LONGITUDE + ")"));
         fieldsMap.put(DataSourceType.LOCATION_SUMMARY, fields);
 
-        fields = new ArrayList<DataTypeField>();
+        fields = new ArrayList<>();
         fields.add(new DataTypeField("average", floatPoint, "AVG(" + DB.LOCATION.SPEED + ")"));
         fields.add(new DataTypeField("max", floatPoint, "MAX(" + DB.LOCATION.SPEED + ")"));
         fields.add(new DataTypeField("min", floatPoint, "MIN(" + DB.LOCATION.SPEED + ")"));
@@ -124,17 +123,17 @@ public GoogleFitData(final SQLiteDatabase db, String project, Context ctx) {
         this.mContext = ctx;
     }
 
-    public final String getProjectId() {
+    private String getProjectId() {
         return mProjectId;
     }
 
-    public final SQLiteDatabase getDB() {
+    private SQLiteDatabase getDB() {
         return mDB;
     }
 
 
     public final List<DataSourceType> getActivityDataSourceTypes(long activityId) {
-        List<DataSourceType> neededSources = new ArrayList<DataSourceType>();
+        List<DataSourceType> neededSources = new ArrayList<>();
 
         String[] pColumns = {DB.LOCATION.TIME};
 
@@ -182,7 +181,7 @@ public final void exportDataSource(DataSourceType type, Writer writer) {
             w.beginObject();
             w.name("dataStreamId").value(type.getDataStreamId(this));
             w.name("dataStreamName").value(type.getDataName());
-            w.name("type").value(type.SOURCE_TYPE);
+            w.name("type").value(DataSourceType.SOURCE_TYPE);
             w.name("dataType");
             w.beginObject();
             w.name("name").value(type.getDataType());
@@ -267,13 +266,13 @@ private String exportActivitySegments(DataSourceType source, long activityId, St
 
     private String exportSourceDataPoints(DataSourceType source, long activityId, StringWriter writer) {
 
-        ArrayList<String> pColumns = new ArrayList<String>();
+        ArrayList<String> pColumns = new ArrayList<>();
         pColumns.add("MIN(" + DB.LOCATION.TIME + ") AS MIN");
         pColumns.add("MAX(" + DB.LOCATION.TIME + ")");
         Cursor minMaxTime = getDB().query(DB.LOCATION.TABLE, pColumns.toArray(new String[pColumns.size()]), DB.LOCATION.ACTIVITY + " = " + activityId, null, null, null, null);
         minMaxTime.moveToFirst();
 
-        pColumns = new ArrayList<String>();
+        pColumns = new ArrayList<>();
         pColumns.add(DB.LOCATION.TIME);
         List<DataTypeField> fields = DATA_TYPE_FIELDS.get(source);
         for (DataTypeField field : fields) {
@@ -331,7 +330,7 @@ private String exportSourceDataPoints(DataSourceType source, long activityId, St
 
     private String exportActivitySummary(DataSourceType source, long activityId, StringWriter writer) {
 
-        ArrayList<String> pColumns = new ArrayList<String>();
+        ArrayList<String> pColumns = new ArrayList<>();
         pColumns.add(DB.ACTIVITY.START_TIME);
         pColumns.add(DB.ACTIVITY.TIME);
         List<DataTypeField> fields = DATA_TYPE_FIELDS.get(source);
@@ -377,6 +376,7 @@ private String exportActivitySummary(DataSourceType source, long activityId, Str
         return getDataSetURLSuffix(source, startTime, endTime);
     }
 
+    @SuppressLint("PrivateResource")
     private void addApplicationObject(JsonWriter w) throws IOException {
         w.beginObject();
         w.name("name").value(mContext.getString(R.string.app_name));
@@ -405,6 +405,7 @@ private void writeDataPointValues(List<DataTypeField> fields, Cursor cursor, Jso
         }
     }
 
+    @SuppressLint("PrivateResource")
     public final String exportSession(long activityId, Writer writer) {
         String[] pColumns = {
                 DB.ACTIVITY.START_TIME, DB.ACTIVITY.TIME, DB.ACTIVITY.COMMENT, DB.ACTIVITY.SPORT
@@ -446,6 +447,7 @@ private String getDataSetURLSuffix(DataSourceType source, long startTime, long e
         return GoogleFitSynchronizer.REST_DATASOURCE + "/" + SyncHelper.URLEncode(source.getDataStreamId(this)) + "/" + GoogleFitSynchronizer.REST_DATASETS + "/" + startTime + "-" + endTime;
     }
 
+    @SuppressLint("PrivateResource")
     private String getSessionURLSuffix(long startTime, long endTime) {
         return GoogleFitSynchronizer.REST_SESSIONS + "/" + mContext.getString(R.string.app_name) + "-" + startTime + "-" + endTime;
     }
diff --git a/app/src/org/runnerup/export/format/GoogleStaticMap.java b/app/src/org/runnerup/export/format/GoogleStaticMap.java
index e15233e01..4fedbc784 100644
--- a/app/src/org/runnerup/export/format/GoogleStaticMap.java
+++ b/app/src/org/runnerup/export/format/GoogleStaticMap.java
@@ -17,10 +17,8 @@
 
 package org.runnerup.export.format;
 
-import android.annotation.TargetApi;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.util.Log;
 
 import org.runnerup.common.util.Constants.DB;
@@ -28,11 +26,10 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class GoogleStaticMap {
 
-    long mID = 0;
-    SQLiteDatabase mDB = null;
+    private SQLiteDatabase mDB = null;
 
     public GoogleStaticMap(SQLiteDatabase mDB) {
         this.mDB = mDB;
@@ -42,7 +39,7 @@ public static void main(final String args[]) {
         long lat0 = 0, lot0 = 0;
         StringBuffer dst = new StringBuffer();
         for (int i = 0; i + 1 < args.length; i += 2) {
-            long lat = Long.parseLong(args[i + 0]);
+            long lat = Long.parseLong(args[i /*+ 0*/]);
             long lot = Long.parseLong(args[i + 1]);
             encode(dst, lat, lot, lat0, lot0);
             System.err.print("[ " + lat + ", " + lot + "] ");
@@ -52,7 +49,7 @@ public static void main(final String args[]) {
         Log.e("GoogleStaticMap", " => " + dst.toString());
     }
 
-    public static void encode(StringBuffer buf, long val) {
+    private static void encode(StringBuffer buf, long val) {
         val <<= 1;
         if (val < 0) {
             val = ~val;
@@ -67,13 +64,13 @@ public static void encode(StringBuffer buf, long val) {
         } while (val != 0);
     }
 
-    public static void encode(StringBuffer dst, long latitude1, long longitude1, long latitude0,
-            long longitude0) {
+    private static void encode(StringBuffer dst, long latitude1, long longitude1, long latitude0,
+                               long longitude0) {
         encode(dst, latitude1 - latitude0);
         encode(dst, longitude1 - longitude0);
     }
 
-    public long countLocations(long activityId) {
+    private long countLocations(long activityId) {
         long count = 0;
         String[] args = {
             Long.toString(activityId)
@@ -95,10 +92,10 @@ public String export(long activityId, final int maxLen) {
 
         long count = countLocations(activityId);
         int avgLen = 6; // in this encoding 1 location "normally" takes 9 chars
-        StringBuffer dst = null;
+        StringBuffer dst;
         do {
             dst = new StringBuffer();
-            /**
+            /*
 			 * 
 			 */
             final int points = maxLen / avgLen;
diff --git a/app/src/org/runnerup/export/format/NikeXML.java b/app/src/org/runnerup/export/format/NikeXML.java
index d3afa4f62..caeea3dd4 100644
--- a/app/src/org/runnerup/export/format/NikeXML.java
+++ b/app/src/org/runnerup/export/format/NikeXML.java
@@ -17,11 +17,9 @@
 
 package org.runnerup.export.format;
 
-import android.annotation.TargetApi;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.location.Location;
-import android.os.Build;
 
 import org.runnerup.common.util.Constants.DB;
 import org.runnerup.util.Formatter;
@@ -38,14 +36,14 @@
  * @author jonas.oreland@gmail.com
  * 
  */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class NikeXML {
 
     private static final String DEVICE = "iPod";
 
-    SQLiteDatabase mDB = null;
-    KXmlSerializer mXML = null;
-    SimpleDateFormat simpleDateFormat = null;
+    private SQLiteDatabase mDB = null;
+    private KXmlSerializer mXML = null;
+    private SimpleDateFormat simpleDateFormat = null;
 
     public NikeXML(final SQLiteDatabase db) {
         mDB = db;
@@ -237,7 +235,7 @@ private boolean emitHeartrateStats(long mID) throws IllegalArgumentException,
 
     private void emitHRPosition(long mID, String string, int hrVal)
             throws IllegalArgumentException, IllegalStateException, IOException {
-        long _id = 0;
+        long _id;
         { // 1 find a point with specified value
             String args[] = {
                     Long.toString(mID), Integer.toString(hrVal)
@@ -458,8 +456,8 @@ private void emitList(final long activityId, final Dim d, final double add, fina
         try {
             final Pos p = new Pos();
             int lastLap = 0;
-            final Vector<Location> locHist = new Vector<Location>();
-            final Vector<Pos> posHist = new Vector<Pos>();
+            final Vector<Location> locHist = new Vector<>();
+            final Vector<Pos> posHist = new Vector<>();
             if (c.moveToFirst()) {
                 do {
                     final int type = c.getInt(5);
@@ -493,9 +491,9 @@ private void emitList(final long activityId, final Dim d, final double add, fina
                     while ((d == Dim.DISTANCE && p.sumDistance + deltaDist >= first)
                             || (d == Dim.TIME && p.sumTime + deltaTime >= first)) {
 
-                        double diffTime = 0;
-                        double diffDist = 0;
-                        double pct = 0;
+                        double diffTime;
+                        double diffDist;
+                        double pct;
                         if (d == Dim.DISTANCE) {
                             diffDist = first - p.sumDistance;
                             pct = diffDist / deltaDist;
@@ -553,7 +551,7 @@ private void emitList(final long activityId, final Dim d, final double add, fina
         }
     }
 
-    static final double R = 6371.0; // radius of earth in km
+    private static final double R = 6371.0; // radius of earth in km
 
     /**
      * Move a location <em>dist</em> meters in direction of <em>bearing</em>
@@ -563,7 +561,7 @@ private void emitList(final long activityId, final Dim d, final double add, fina
      * @param dist
      * @see <url>http://www.movable-type.co.uk/scripts/latlong.html</url>
      */
-    public static void move(final Location l, final double bearing, final double dist) {
+    private static void move(final Location l, final double bearing, final double dist) {
         final double d = dist / 1000.0; // in km
         final double lat1 = Math.toRadians(l.getLatitude());
         final double lon1 = Math.toRadians(l.getLongitude());
diff --git a/app/src/org/runnerup/export/format/RunKeeper.java b/app/src/org/runnerup/export/format/RunKeeper.java
index 39a959223..b10d02e23 100644
--- a/app/src/org/runnerup/export/format/RunKeeper.java
+++ b/app/src/org/runnerup/export/format/RunKeeper.java
@@ -17,10 +17,8 @@
 
 package org.runnerup.export.format;
 
-import android.annotation.TargetApi;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.util.Log;
 
 import org.json.JSONArray;
@@ -56,17 +54,16 @@
  * 
  */
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class RunKeeper {
 
-    long mID = 0;
-    SQLiteDatabase mDB = null;
+    private SQLiteDatabase mDB = null;
 
     public RunKeeper(SQLiteDatabase db) {
         mDB = db;
     }
 
-    static String formatTime(long time) {
+    private static String formatTime(long time) {
         return new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss", Locale.US)
                 .format(new Date(time));
     }
@@ -98,10 +95,10 @@ public void export(long activityId, Writer writer) throws IOException {
             if (ae.getMaxHr()!=null) {
                 w.name("heart_rate");
                 w.beginArray();
-                exportHeartRate(activityId, startTime, w);
+                exportHeartRate(activityId, w);
                 w.endArray();
             }
-            exportPath("path", activityId, startTime, w);
+            exportPath("path", activityId, w);
             w.name("post_to_facebook").value(false);
             w.name("post_to_twitter").value(false);
             w.endObject();
@@ -110,7 +107,7 @@ public void export(long activityId, Writer writer) throws IOException {
         }
     }
 
-    private void exportHeartRate(long activityId, long startTime, JsonWriter w)
+    private void exportHeartRate(long activityId, JsonWriter w)
             throws IOException {
         String[] pColumns = {
                 DB.LOCATION.TIME, DB.LOCATION.HR
@@ -119,7 +116,7 @@ private void exportHeartRate(long activityId, long startTime, JsonWriter w)
                 DB.LOCATION.ACTIVITY + " = " + activityId, null, null, null,
                 null);
         if (cursor.moveToFirst()) {
-            startTime = cursor.getLong(0);
+            long startTime = cursor.getLong(0);
             do {
                 if (!cursor.isNull(1)) {
                     w.beginObject();
@@ -133,7 +130,7 @@ private void exportHeartRate(long activityId, long startTime, JsonWriter w)
         cursor.close();
     }
 
-    private void exportPath(String name, long activityId, long startTime, JsonWriter w)
+    private void exportPath(String name, long activityId, JsonWriter w)
             throws IOException {
         String[] pColumns = {
                 DB.LOCATION.TIME, DB.LOCATION.LATITUDE,
@@ -145,7 +142,7 @@ private void exportPath(String name, long activityId, long startTime, JsonWriter
         if (cursor.moveToFirst()) {
             w.name(name);
             w.beginArray();
-            startTime = cursor.getLong(0);
+            long startTime = cursor.getLong(0);
             do {
                 w.beginObject();
                 w.name("timestamp").value(
@@ -193,8 +190,8 @@ public static ActivityEntity parseToActivity(JSONObject response, double unitMet
             return null;
         }
 
-        List<LapEntity> laps = new ArrayList<LapEntity>();
-        List<LocationEntity> locations = new ArrayList<LocationEntity>();
+        List<LapEntity> laps = new ArrayList<>();
+        List<LocationEntity> locations = new ArrayList<>();
 
         JSONArray distance = response.getJSONArray("distance");
         JSONArray path = response.getJSONArray("path");
@@ -325,13 +322,13 @@ public static ActivityEntity parseToActivity(JSONObject response, double unitMet
     }
 
     private static SortedMap<Long, HashMap<String, String>> createPointsMap(JSONArray distance, JSONArray path, JSONArray hr) throws JSONException {
-        SortedMap<Long, HashMap<String, String>> result = new TreeMap<Long, HashMap<String, String>>();
+        SortedMap<Long, HashMap<String, String>> result = new TreeMap<>();
 
         if (distance != null && distance.length() > 0) {
             for (int i = 0; i < distance.length(); i++) {
                 JSONObject o = distance.getJSONObject(i);
                 Long key = TimeUnit.SECONDS.toMillis((long) Float.parseFloat(o.getString("timestamp")));
-                HashMap<String, String> value = new HashMap<String, String>();
+                HashMap<String, String> value = new HashMap<>();
                 String valueMapKey = "distance";
                 String valueMapValue = o.getString(valueMapKey);
                 value.put(valueMapKey, valueMapValue);
@@ -345,7 +342,7 @@ private static SortedMap<Long, HashMap<String, String>> createPointsMap(JSONArra
                 Long key = TimeUnit.SECONDS.toMillis((long)Float.parseFloat(o.getString("timestamp")));
                 HashMap<String, String> value = result.get(key);
                 if (value == null) {
-                    value = new HashMap<String, String>();
+                    value = new HashMap<>();
                 }
                 String[] attrs = new String[] {"latitude", "longitude", "altitude", "type"};
                 for (String valueMapKey : attrs) {
@@ -362,7 +359,7 @@ private static SortedMap<Long, HashMap<String, String>> createPointsMap(JSONArra
                 Long key = TimeUnit.SECONDS.toMillis((long)Float.parseFloat(o.getString("timestamp")));
                 HashMap<String, String> value = result.get(key);
                 if (value == null) {
-                    value = new HashMap<String, String>();
+                    value = new HashMap<>();
                 }
                 String valueMapKey = "heart_rate";
                 String valueMapValue = o.getString(valueMapKey);
diff --git a/app/src/org/runnerup/export/format/RunalyzePost.java b/app/src/org/runnerup/export/format/RunalyzePost.java
index 92d2fe97b..43546805e 100644
--- a/app/src/org/runnerup/export/format/RunalyzePost.java
+++ b/app/src/org/runnerup/export/format/RunalyzePost.java
@@ -42,8 +42,8 @@
 public class RunalyzePost {
 
     private SQLiteDatabase mDB = null;
-    private Map<String,Map<String,String>> sports;
-    private Map<String,Map<String,String>> types;
+    private final Map<String,Map<String,String>> sports;
+    private final Map<String,Map<String,String>> types;
 
     /**
      * Constructor using the database.
@@ -66,7 +66,7 @@ public RunalyzePost(SQLiteDatabase mDB, Map<String,Map<String,String>> sports, M
      * @param activityId The activity id
      * @return The cursor associated to the list of locations of the activity
      */
-    public Cursor createLocationCursor(long activityId) {
+    private Cursor createLocationCursor(long activityId) {
         String[] columns = {
                 Constants.DB.LOCATION.TIME,
                 Constants.DB.LOCATION.LATITUDE,
@@ -86,7 +86,7 @@ public Cursor createLocationCursor(long activityId) {
      * @param writer The writer to write with
      * @throws IOException Some error writing the value
      */
-    public void writeValue(String value, String defaultValue, Writer writer) throws IOException {
+    private void writeValue(String value, String defaultValue, Writer writer) throws IOException {
         try {
             if (value == null) {
                 value = defaultValue;
@@ -104,7 +104,7 @@ public void writeValue(String value, String defaultValue, Writer writer) throws
      * @param writer The writer to write
      * @throws IOException Some error
      */
-    public void writeArrTime(Cursor c, Writer writer) throws IOException {
+    private void writeArrTime(Cursor c, Writer writer) throws IOException {
         writer.write("arr_time");
         writer.write("=");
         if (c.moveToFirst()) {
@@ -124,7 +124,7 @@ public void writeArrTime(Cursor c, Writer writer) throws IOException {
      * @param writer The writer to write
      * @throws IOException Some error
      */
-    public void writeArrDist(Cursor c, Writer writer) throws IOException {
+    private void writeArrDist(Cursor c, Writer writer) throws IOException {
         writer.write("arr_dist");
         writer.write("=");
         if (c.moveToFirst()) {
@@ -157,7 +157,7 @@ public void writeArrDist(Cursor c, Writer writer) throws IOException {
      * @param writer The writer to write
      * @throws IOException Some error
      */
-    public void writeLocationField(String name, int column, String defaultValue, Cursor c, Writer writer) throws IOException {
+    private void writeLocationField(String name, int column, String defaultValue, Cursor c, Writer writer) throws IOException {
         writer.write(name);
         writer.write("=");
         if (c.moveToFirst()) {
@@ -176,7 +176,7 @@ public void writeLocationField(String name, int column, String defaultValue, Cur
      * @param writer The writer to write
      * @throws IOException Some error
      */
-    public void writeLocationFields(long activityId, Writer writer) throws IOException {
+    private void writeLocationFields(long activityId, Writer writer) throws IOException {
         Cursor c = null;
         try {
             c = createLocationCursor(activityId);
@@ -202,7 +202,7 @@ public void writeLocationFields(long activityId, Writer writer) throws IOExcepti
      * @param activityId The activity id
      * @return The cursor associated to the list of laps of the activity
      */
-    public Cursor createLapCursor(long activityId) {
+    private Cursor createLapCursor(long activityId) {
         String[] columns = {
                 Constants.DB.LAP.DISTANCE,
                 Constants.DB.LAP.TIME,
@@ -220,7 +220,7 @@ public Cursor createLapCursor(long activityId) {
      * @param writer The writer to write
      * @throws IOException Some error
      */
-    public void writeNomalField(String name, String value, String defaultValue, Writer writer) throws IOException {
+    private void writeNomalField(String name, String value, String defaultValue, Writer writer) throws IOException {
         writer.write(name);
         writer.write("=");
         writeValue(value, defaultValue, writer);
@@ -232,7 +232,7 @@ public void writeNomalField(String name, String value, String defaultValue, Writ
      * @param seconds The seconds to transform
      * @return The string with the seconds in format mm:ss
      */
-    public String seconds2MinuteAndSeconds(long seconds) {
+    private String seconds2MinuteAndSeconds(long seconds) {
         // runalyze has some data that is expressed in mm:ss (TIME_MINUTES)
         // you can check it in class.FormularValueParser.php method validateTimeMinutes
         long m = seconds / 60;
@@ -246,7 +246,7 @@ public String seconds2MinuteAndSeconds(long seconds) {
      * @param writer The writer to write
      * @throws IOException Some error
      */
-    public void writeLapFields(long activityId, Writer writer) throws IOException {
+    private void writeLapFields(long activityId, Writer writer) throws IOException {
         Cursor c = null;
         try {
             c = createLapCursor(activityId);
@@ -273,7 +273,7 @@ public void writeLapFields(long activityId, Writer writer) throws IOException {
      * @param activityId The activity id
      * @return The cursor associated to the activity
      */
-    public Cursor createActivityCursor(long activityId) {
+    private Cursor createActivityCursor(long activityId) {
         String[] columns = {
                 Constants.DB.ACTIVITY.START_TIME,
                 Constants.DB.ACTIVITY.TIME,
@@ -288,21 +288,20 @@ public Cursor createActivityCursor(long activityId) {
     }
 
     /**
-     * <em>Runalyze</em> calculates the calories using the table of sports. By default they
-     * are using this:
+     * Runalyze sports are stored in the table <em>runalyze_sport</em>. For the moment
+     * they are:
      * <pre>
-     * | id | name       | kcal |
-     * |  1 | Running    |  880 |
-     * |  2 | Swimming   |  743 |
-     * |  3 | Biking     |  770 |
-     * |  4 | Gymnastics |  280 |
-     * |  5 | Other      |  500 |
+     * |  1 | Running
+     * |  2 | Swimming
+     * |  3 | Biking
+     * |  4 | Gymnastics
+     * |  5 | Other
      * </pre>
-     * @param dbValue The sport id used in runnerup
-     * @param seconds The time of the activity for the calculation
-     * @return The kCal used in string
+     *
+     * @param dbValue The sport as used in runnerup
+     * @return The id of the sport in a string
      */
-    public String calculateKCal(int dbValue, long seconds) {
+    private String calculateKCal(int dbValue, long seconds) {
         Sport sport = Sport.valueOf(dbValue);
         if (sport.IsRunning()) {
             return Integer.toString(Math.round((880.0F / 3600.0F) * seconds));
@@ -326,15 +325,15 @@ public String calculateKCal(int dbValue, long seconds) {
      * @param seconds The time of the activity for the calculation
      * @throws IOException Some error
      */
-    public void calculateSportTypeAndKCal(int dbValue, long seconds, Writer writer) throws IOException {
+    private void calculateSportTypeAndKCal(int dbValue, long seconds, Writer writer) throws IOException {
         //
         // calculate sportid
         Sport sport = Sport.valueOf(dbValue);
-        String sportName = sport.name().toLowerCase();
+        String sportName = sport.name().toLowerCase(Locale.US);
         String sportId = "1"; // default values is 1 (just something)
         String sportFound = null;
         for (String runalyzeSport: sports.keySet()) {
-            if (runalyzeSport.toLowerCase().contains(sportName) &&
+            if (runalyzeSport.toLowerCase(Locale.US).contains(sportName) &&
                     sports.get(runalyzeSport).containsKey("value")) {
                 sportId = sports.get(runalyzeSport).get("value");
                 sportFound = runalyzeSport;
@@ -366,7 +365,7 @@ public void calculateSportTypeAndKCal(int dbValue, long seconds, Writer writer)
         writeNomalField("typeid", typeId, null, writer);
         //
         // calculate kcal
-        String kcal = null;
+        String kcal;
         if (sportFound != null && sports.get(sportFound).containsKey("data-kcal")) {
             kcal = Integer.toString(Math.round((Float.parseFloat(sports.get(sportFound).get("data-kcal")) / 3600.0F) * seconds));
             Log.d(getClass().getName(), "Kcal using sports value: " + sports.get(sportFound).get("data-kcal"));
@@ -384,7 +383,7 @@ public void calculateSportTypeAndKCal(int dbValue, long seconds, Writer writer)
      * @param writer The writer to write
      * @throws IOException Some error
      */
-    public void writeActivityFields(long activityId, Writer writer) throws IOException {
+    private void writeActivityFields(long activityId, Writer writer) throws IOException {
         Cursor c = null;
         try {
             c = createActivityCursor(activityId);
@@ -398,10 +397,10 @@ public void writeActivityFields(long activityId, Writer writer) throws IOExcepti
                 writeNomalField("pulse_max", c.getString(4), "0", writer);
                 writeNomalField("comment", c.getString(5), "", writer);
                 writeNomalField("pace", seconds2MinuteAndSeconds(Math.round(c.getFloat(1)*1000.0F/c.getFloat(2))), "", writer);
-                // write sportid, typeid and kcal depending the sports and types read from runalyze
+                // the type is finally blank, it was decided better not to provide anything
                 calculateSportTypeAndKCal(c.getInt(6), c.getLong(1), writer);
+                // previously it was called with runnerupSport2RunalyzeType(c.getInt(6))
                 // it seems that the activity_id in runalyze is set in "class.ParserAbstractSingle.php"
-                // and it is just the timestamp in seconds of the activity
                 writeNomalField("activity_id", Long.toString(c.getLong(0)), null, writer);
             }
         } finally {
@@ -420,7 +419,7 @@ public void writeActivityFields(long activityId, Writer writer) throws IOExcepti
      * @param writer The writer to write.
      * @throws IOException Some error
      */
-    public void writeFixedFields(Writer writer) throws IOException {
+    private void writeFixedFields(Writer writer) throws IOException {
         writeNomalField("creator", "", null, writer);
         writeNomalField("creator_details", "", null, writer);
         writeNomalField("timezone_offset", Integer.toString(TimeZone.getDefault().getRawOffset() / 60000), null, writer);
diff --git a/app/src/org/runnerup/export/format/TCX.java b/app/src/org/runnerup/export/format/TCX.java
index 39c9ab27f..c7e92f3d6 100644
--- a/app/src/org/runnerup/export/format/TCX.java
+++ b/app/src/org/runnerup/export/format/TCX.java
@@ -17,17 +17,13 @@
 
 package org.runnerup.export.format;
 
-import android.annotation.TargetApi;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.location.Location;
-import android.os.Build;
 import android.util.Pair;
 
-import org.runnerup.common.util.Constants;
 import org.runnerup.common.util.Constants.DB;
 import org.runnerup.util.KXmlSerializer;
-import org.runnerup.view.FeedActivity;
 import org.runnerup.workout.Sport;
 
 import java.io.IOException;
@@ -46,15 +42,14 @@
  *
  */
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class TCX {
 
-    long mID = 0;
-    SQLiteDatabase mDB = null;
-    KXmlSerializer mXML = null;
-    String notes = null;
-    SimpleDateFormat simpleDateFormat = null;
-    Sport sport = null;
+    private SQLiteDatabase mDB = null;
+    private KXmlSerializer mXML = null;
+    private String notes = null;
+    private SimpleDateFormat simpleDateFormat = null;
+    private Sport sport = null;
 
     private boolean addGratuitousTrack = false;
 
@@ -64,7 +59,7 @@ public TCX(SQLiteDatabase mDB) {
         simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
     }
 
-    String formatTime(long time) {
+    private String formatTime(long time) {
         return simpleDateFormat.format(new Date(time));
     }
 
@@ -151,7 +146,7 @@ else if (sport.IsCycling()) {
             mXML.endDocument();
             mXML = null;
             cursor.close();
-            return new Pair<String, Sport>(id, sport);
+            return new Pair<>(id, sport);
         } catch (IOException e) {
             cursor.close();
             mXML = null;
diff --git a/app/src/org/runnerup/export/oauth2client/OAuth2Activity.java b/app/src/org/runnerup/export/oauth2client/OAuth2Activity.java
index 069c82292..6449091b8 100644
--- a/app/src/org/runnerup/export/oauth2client/OAuth2Activity.java
+++ b/app/src/org/runnerup/export/oauth2client/OAuth2Activity.java
@@ -18,14 +18,12 @@
 package org.runnerup.export.oauth2client;
 
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
@@ -49,7 +47,7 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 @SuppressLint("SetJavaScriptEnabled")
 public class OAuth2Activity extends AppCompatActivity {
 
@@ -58,29 +56,27 @@ public class OAuth2Activity extends AppCompatActivity {
      */
     public interface OAuth2ServerCredentials {
 
-        public static final String AUTH_ARGUMENTS = "auth_arguments";
+        String AUTH_ARGUMENTS = "auth_arguments";
 
         /**
          * Used as title when opening authorization dialog
-         * 
-         * @return
          */
-        public static final String NAME = "name";
-        public static final String CLIENT_ID = "client_id";
-        public static final String CLIENT_SECRET = "client_secret";
-        public static final String AUTH_URL = "auth_url";
-        public static final String AUTH_EXTRA = "auth_extra";
-        public static final String TOKEN_URL = "token_url";
-        public static final String REDIRECT_URI = "redirect_uri";
-        public static final String REVOKE_URL = "revoke_url";
-
-        public static final String AUTH_TOKEN = "auth_token";
+        String NAME = "name";
+        String CLIENT_ID = "client_id";
+        String CLIENT_SECRET = "client_secret";
+        String AUTH_URL = "auth_url";
+        String AUTH_EXTRA = "auth_extra";
+        String TOKEN_URL = "token_url";
+        String REDIRECT_URI = "redirect_uri";
+        String REVOKE_URL = "revoke_url";
+
+        String AUTH_TOKEN = "auth_token";
     }
 
-    boolean mFinished = false;
-    String mRedirectUri = null;
-    ProgressDialog mSpinner = null;
-    Bundle mArgs = null;
+    private boolean mFinished = false;
+    private String mRedirectUri = null;
+    private ProgressDialog mSpinner = null;
+    private Bundle mArgs = null;
 
     @SuppressWarnings("deprecation")
     private void setSavedPassword(WebView wv, boolean val) {
@@ -149,6 +145,7 @@ public void onPageStarted(WebView view, String url, Bitmap favicon) {
                     mSpinner.show();
             }
 
+            @SuppressLint("StaticFieldLeak")
             @Override
             public void onPageFinished(WebView view, String url) {
                 super.onPageFinished(view, url);
@@ -205,11 +202,6 @@ public void onPageFinished(WebView view, String url) {
                     res.putExtra("url", token_url);
 
                     new AsyncTask<String, String, Integer>() {
-                        @Override
-                        protected void onPreExecute() {
-                            super.onPreExecute();
-                        }
-
                         @Override
                         protected Integer doInBackground(String... params) {
                             int resultCode = Activity.RESULT_OK;
diff --git a/app/src/org/runnerup/export/oauth2client/OAuth2Server.java b/app/src/org/runnerup/export/oauth2client/OAuth2Server.java
index b473707a5..9037f3143 100644
--- a/app/src/org/runnerup/export/oauth2client/OAuth2Server.java
+++ b/app/src/org/runnerup/export/oauth2client/OAuth2Server.java
@@ -23,19 +23,19 @@ public interface OAuth2Server {
      * 
      * @return
      */
-    public String getName();
+    String getName();
 
-    public String getClientId();
+    String getClientId();
 
-    public String getRedirectUri();
+    String getRedirectUri();
 
-    public String getClientSecret();
+    String getClientSecret();
 
-    public String getAuthUrl();
+    String getAuthUrl();
 
-    public String getAuthExtra();
+    String getAuthExtra();
 
-    public String getTokenUrl();
+    String getTokenUrl();
 
-    public String getRevokeUrl();
+    String getRevokeUrl();
 }
diff --git a/app/src/org/runnerup/export/util/FormValues.java b/app/src/org/runnerup/export/util/FormValues.java
index 28213cd8b..f98546eaa 100644
--- a/app/src/org/runnerup/export/util/FormValues.java
+++ b/app/src/org/runnerup/export/util/FormValues.java
@@ -17,15 +17,12 @@
 
 package org.runnerup.export.util;
 
-import android.annotation.TargetApi;
-import android.os.Build;
-
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.HashMap;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class FormValues extends HashMap<String, String> implements Writable {
     /**
      *
diff --git a/app/src/org/runnerup/export/util/Part.java b/app/src/org/runnerup/export/util/Part.java
index 65567f8e5..078c1e660 100644
--- a/app/src/org/runnerup/export/util/Part.java
+++ b/app/src/org/runnerup/export/util/Part.java
@@ -17,17 +17,14 @@
 
 package org.runnerup.export.util;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
 public class Part<Value extends Writable> {
 
-    String name = null;
-    String filename = null;
-    String contentType = null;
-    String contentTransferEncoding = null;
-    Value value = null;
+    private String name = null;
+    private String filename = null;
+    private String contentType = null;
+    private String contentTransferEncoding = null;
+    private Value value = null;
 
     public Part(String name, Value value) {
         this.name = name;
diff --git a/app/src/org/runnerup/export/util/StringWritable.java b/app/src/org/runnerup/export/util/StringWritable.java
index 02492aae0..789849c0b 100644
--- a/app/src/org/runnerup/export/util/StringWritable.java
+++ b/app/src/org/runnerup/export/util/StringWritable.java
@@ -17,15 +17,12 @@
 
 package org.runnerup.export.util;
 
-import android.annotation.TargetApi;
-import android.os.Build;
-
 import java.io.IOException;
 import java.io.OutputStream;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class StringWritable implements Writable {
-    final String s;
+    private final String s;
 
     public StringWritable(String s) {
         this.s = s;
diff --git a/app/src/org/runnerup/export/util/Writable.java b/app/src/org/runnerup/export/util/Writable.java
index e127f1f47..9d7a1f7df 100644
--- a/app/src/org/runnerup/export/util/Writable.java
+++ b/app/src/org/runnerup/export/util/Writable.java
@@ -20,6 +20,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-public interface Writable {
+interface Writable {
     void write(OutputStream out) throws IOException;
 }
diff --git a/app/src/org/runnerup/feed/FeedImageLoader.java b/app/src/org/runnerup/feed/FeedImageLoader.java
index 8113a9018..b418ec7e6 100644
--- a/app/src/org/runnerup/feed/FeedImageLoader.java
+++ b/app/src/org/runnerup/feed/FeedImageLoader.java
@@ -17,11 +17,10 @@
 
 package org.runnerup.feed;
 
-import android.annotation.TargetApi;
+import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.util.Log;
 
 import java.io.InputStream;
@@ -30,7 +29,7 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class FeedImageLoader {
     static private final Map<String, Bitmap> imageCache = Collections
             .synchronizedMap(new WeakHashMap<String, Bitmap>());
@@ -58,6 +57,7 @@ static public Bitmap LoadImageSync(final String url) {
         return null;
     }
 
+    @SuppressLint("StaticFieldLeak")
     static public void LoadImageAsync(final String url, final Callback onLoadingDone) {
         final String fixedUrl = FixUrl(url);
         Bitmap b = imageCache.get(url);
diff --git a/app/src/org/runnerup/feed/FeedList.java b/app/src/org/runnerup/feed/FeedList.java
index c826c028b..ce5ef5263 100644
--- a/app/src/org/runnerup/feed/FeedList.java
+++ b/app/src/org/runnerup/feed/FeedList.java
@@ -17,11 +17,9 @@
 
 package org.runnerup.feed;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.util.Log;
 
 import org.runnerup.common.util.Constants;
@@ -36,15 +34,15 @@
 import java.util.Set;
 import java.util.TimeZone;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class FeedList extends Observable implements Constants {
 
-    static final int MAX_ITEMS = 50;
-    static final long TIME_MARGIN = 5 * 60; // 5 minutes
+    private static final int MAX_ITEMS = 50;
+    private static final long TIME_MARGIN = 5 * 60; // 5 minutes
 
-    final SQLiteDatabase mDB;
-    List<ContentValues> list = new ArrayList<ContentValues>();
-    boolean filterDuplicates = true;
+    private final SQLiteDatabase mDB;
+    private List<ContentValues> list = new ArrayList<>();
+    private boolean filterDuplicates = true;
 
     public FeedList(SQLiteDatabase db) {
         mDB = db;
@@ -74,14 +72,13 @@ public void reset() {
         mDB.execSQL("DELETE FROM " + DB.FEED.TABLE);
     }
 
-    public void prune() {
+    private void prune() {
         if (list.size() >= MAX_ITEMS + 1) {
             ContentValues tmp = list.get(MAX_ITEMS);
             long start_time = tmp.getAsLong(DB.FEED.START_TIME);
             mDB.execSQL("DELETE FROM " + DB.FEED.TABLE + " WHERE " + DB.FEED.START_TIME + " < "
                     + start_time);
-            List<ContentValues> swap = list.subList(0, MAX_ITEMS);
-            list = swap;
+            list = list.subList(0, MAX_ITEMS);
         }
     }
 
@@ -97,13 +94,13 @@ public class FeedUpdater {
         int discarded = 0;
 
         FeedUpdater() {
-            currList = new ArrayList<ContentValues>(list.size());
+            currList = new ArrayList<>(list.size());
             for (ContentValues c : list) { // initialize list with already
                                            // present items
                 if (!isHeaderDate(c))
                     currList.add(c);
             }
-            addList = new ArrayList<ContentValues>(list.size());
+            addList = new ArrayList<>(list.size());
         }
 
         public void start(String synchronizerName) {
@@ -132,7 +129,7 @@ public void add(ContentValues values) {
 
             for (int i = startIndex; i <= endIndex; i++) {
                 ContentValues c = currList.get(i);
-                if (match(values, c, filterDuplicates) == true) {
+                if (match(values, c, filterDuplicates)) {
                     // Set already contains matching row...skip this
                     discarded++;
                     return;
@@ -177,7 +174,7 @@ public FeedUpdater getUpdater() {
     }
 
     public static List<ContentValues> addHeaders(List<ContentValues> oldList) {
-        List<ContentValues> newList = new ArrayList<ContentValues>(oldList.size());
+        List<ContentValues> newList = new ArrayList<>(oldList.size());
         Calendar lastDate = Calendar.getInstance();
         lastDate.setTimeInMillis(0);
         Calendar tmp = Calendar.getInstance();
@@ -230,10 +227,10 @@ public static boolean isActivity(ContentValues tmp) {
         return tmp.getAsInteger(DB.FEED.FEED_TYPE) == DB.FEED.FEED_TYPE_ACTIVITY;
     }
 
-    public static boolean match(ContentValues c0, ContentValues c1, boolean filterDuplicates) {
-        boolean same_account = c0.getAsLong(DB.FEED.ACCOUNT_ID) == c1.getAsLong(DB.FEED.ACCOUNT_ID);
+    private static boolean match(ContentValues c0, ContentValues c1, boolean filterDuplicates) {
+        boolean same_account = c0.getAsLong(DB.FEED.ACCOUNT_ID).equals(c1.getAsLong(DB.FEED.ACCOUNT_ID));
         if (same_account) {
-            /**
+            /*
              * Always filter duplicates from same account
              */
             if (c0.containsKey(DB.FEED.EXTERNAL_ID) && c1.containsKey(DB.FEED.EXTERNAL_ID)) {
@@ -262,7 +259,7 @@ public static boolean match(ContentValues c0, ContentValues c1, boolean filterDu
         if (!filterDuplicates)
             return false;
 
-        boolean print = false; // enable printout of match failure
+        final boolean print = false; // enable printout of match failure
 
         String keys[] = {
                 DB.FEED.FEED_TYPE,
@@ -275,18 +272,14 @@ public static boolean match(ContentValues c0, ContentValues c1, boolean filterDu
         for (String k : keys) {
             if (c0.containsKey(k) && c1.containsKey(k))
                 if (!c0.getAsString(k).equalsIgnoreCase(c1.getAsString(k))) {
-                    if (print)
-                        Log.i("FeedList", "fail at " + k + " c0: " + c0.getAsString(k) + ", c1: "
-                                + c1.getAsString(k));
+                    //if (print)
+                    //    Log.i("FeedList", "fail at " + k + " c0: " + c0.getAsString(k) + ", c1: "
+                    //            + c1.getAsString(k));
                     return false;
                 }
         }
 
-        if (overlaps(c0, c1, print)) {
-            return true;
-        }
-
-        return false;
+        return overlaps(c0, c1, print);
     }
 
     private static boolean overlaps(ContentValues c0, ContentValues c1, boolean print) {
@@ -314,7 +307,7 @@ private static boolean overlaps(ContentValues c0, ContentValues c1, boolean prin
         boolean broken1 = c1.containsKey(DB.FEED.FLAGS)
                 && c1.getAsString(DB.FEED.FLAGS).contains("brokenStartTime");
         if (broken0 || broken1) {
-            /**
+            /*
              * check if same day, if so compare distance/duration instead
              */
             Calendar d0 = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
diff --git a/app/src/org/runnerup/notification/ForegroundNotificationDisplayStrategy.java b/app/src/org/runnerup/notification/ForegroundNotificationDisplayStrategy.java
index 0ba44daa8..d08e296a2 100644
--- a/app/src/org/runnerup/notification/ForegroundNotificationDisplayStrategy.java
+++ b/app/src/org/runnerup/notification/ForegroundNotificationDisplayStrategy.java
@@ -1,11 +1,9 @@
 package org.runnerup.notification;
 
-import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.Service;
-import android.os.Build;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class ForegroundNotificationDisplayStrategy implements NotificationDisplayStrategy {
     private final Service service;
 
diff --git a/app/src/org/runnerup/notification/GpsBoundState.java b/app/src/org/runnerup/notification/GpsBoundState.java
index 53754b547..1e8e8a525 100644
--- a/app/src/org/runnerup/notification/GpsBoundState.java
+++ b/app/src/org/runnerup/notification/GpsBoundState.java
@@ -1,18 +1,16 @@
 package org.runnerup.notification;
 
-import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.support.v4.app.NotificationCompat;
 
 import org.runnerup.R;
 import org.runnerup.common.util.Constants;
 import org.runnerup.view.MainLayout;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class GpsBoundState implements NotificationState {
     private final Notification notification;
 
diff --git a/app/src/org/runnerup/notification/GpsSearchingState.java b/app/src/org/runnerup/notification/GpsSearchingState.java
index 881fd8a1e..4e82d903f 100644
--- a/app/src/org/runnerup/notification/GpsSearchingState.java
+++ b/app/src/org/runnerup/notification/GpsSearchingState.java
@@ -1,11 +1,9 @@
 package org.runnerup.notification;
 
-import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.support.v4.app.NotificationCompat;
 
 import org.runnerup.R;
@@ -13,7 +11,9 @@
 import org.runnerup.tracker.GpsInformation;
 import org.runnerup.view.MainLayout;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+import java.util.Locale;
+
+
 public class GpsSearchingState implements NotificationState {
     private final Context context;
     private final GpsInformation gpsInformation;
@@ -40,7 +40,7 @@ public GpsSearchingState(Context context, GpsInformation gpsInformation) {
 
     @Override
     public Notification createNotification() {
-        builder.setContentText(String.format("%s: %d/%d%s",
+        builder.setContentText(String.format(Locale.getDefault(), "%s: %d/%d%s",
                 context.getString(R.string.GPS_satellites),
                 gpsInformation.getSatellitesFixed(), gpsInformation.getSatellitesAvailable(),
                 gpsInformation.getGpsAccuracy()));
diff --git a/app/src/org/runnerup/notification/NotificationDisplayStrategy.java b/app/src/org/runnerup/notification/NotificationDisplayStrategy.java
index ff956d3ff..077d5f2a9 100644
--- a/app/src/org/runnerup/notification/NotificationDisplayStrategy.java
+++ b/app/src/org/runnerup/notification/NotificationDisplayStrategy.java
@@ -1,11 +1,9 @@
 package org.runnerup.notification;
 
-import android.annotation.TargetApi;
 import android.app.Notification;
-import android.os.Build;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
-public interface NotificationDisplayStrategy {
+
+interface NotificationDisplayStrategy {
     void notify(int notificationId, Notification notification);
 
     void cancel(int notificationId);
diff --git a/app/src/org/runnerup/notification/NotificationManagerDisplayStrategy.java b/app/src/org/runnerup/notification/NotificationManagerDisplayStrategy.java
index 766eba282..41572cf62 100644
--- a/app/src/org/runnerup/notification/NotificationManagerDisplayStrategy.java
+++ b/app/src/org/runnerup/notification/NotificationManagerDisplayStrategy.java
@@ -1,11 +1,9 @@
 package org.runnerup.notification;
 
-import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.NotificationManager;
-import android.os.Build;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class NotificationManagerDisplayStrategy implements NotificationDisplayStrategy {
     private final NotificationManager notificationManager;
 
diff --git a/app/src/org/runnerup/notification/NotificationState.java b/app/src/org/runnerup/notification/NotificationState.java
index af9b5d0ad..c42b37c83 100644
--- a/app/src/org/runnerup/notification/NotificationState.java
+++ b/app/src/org/runnerup/notification/NotificationState.java
@@ -1,10 +1,8 @@
 package org.runnerup.notification;
 
-import android.annotation.TargetApi;
 import android.app.Notification;
-import android.os.Build;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public interface NotificationState {
     Notification createNotification();
 }
diff --git a/app/src/org/runnerup/notification/NotificationStateManager.java b/app/src/org/runnerup/notification/NotificationStateManager.java
index be4885e4e..14e772f56 100644
--- a/app/src/org/runnerup/notification/NotificationStateManager.java
+++ b/app/src/org/runnerup/notification/NotificationStateManager.java
@@ -1,10 +1,8 @@
 package org.runnerup.notification;
 
-import android.annotation.TargetApi;
 import android.app.Notification;
-import android.os.Build;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class NotificationStateManager {
     private static final int NOTIFICATION_ID = 1;
     private final NotificationDisplayStrategy strategy;
diff --git a/app/src/org/runnerup/notification/OngoingState.java b/app/src/org/runnerup/notification/OngoingState.java
index 07944bcf0..b89f9ba53 100644
--- a/app/src/org/runnerup/notification/OngoingState.java
+++ b/app/src/org/runnerup/notification/OngoingState.java
@@ -1,11 +1,9 @@
 package org.runnerup.notification;
 
-import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.support.v4.app.NotificationCompat;
 
 import org.runnerup.R;
@@ -15,7 +13,7 @@
 import org.runnerup.workout.Scope;
 import org.runnerup.workout.WorkoutInfo;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class OngoingState implements NotificationState {
     private final Formatter formatter;
     private final WorkoutInfo workoutInfo;
diff --git a/app/src/org/runnerup/tracker/GpsStatus.java b/app/src/org/runnerup/tracker/GpsStatus.java
index bfad709be..d3eb8abf2 100644
--- a/app/src/org/runnerup/tracker/GpsStatus.java
+++ b/app/src/org/runnerup/tracker/GpsStatus.java
@@ -18,7 +18,6 @@
 package org.runnerup.tracker;
 
 import android.Manifest;
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.location.GpsSatellite;
@@ -26,7 +25,6 @@
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.location.LocationProvider;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.content.ContextCompat;
 
@@ -39,36 +37,39 @@
  *
  */
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class GpsStatus implements LocationListener,
         android.location.GpsStatus.Listener {
 
-    static final int HIST_LEN = 3;
+    private static final int HIST_LEN = 3;
 
-    boolean mIsFixed = false;
-    Context context = null;
-    Location mHistory[] = null;
-    LocationManager locationManager = null;
-    TickListener listener = null;
+    private boolean mIsFixed = false;
+    private Context context = null;
+    private Location[] mHistory = null;
+    private LocationManager locationManager = null;
+    private TickListener listener = null;
 
     /**
      * If we get a location with accurancy <= mFixAccurancy mFixed => true
      */
-    final float mFixAccurancy = 10;
+    @SuppressWarnings("FieldCanBeLocal")
+    private final float mFixAccurancy = 10;
 
     /**
      * If we get fixed satellites >= mFixSatellites mFixed => true
      */
-    final int mFixSatellites = 2;
+    @SuppressWarnings("FieldCanBeLocal")
+    private final int mFixSatellites = 2;
 
     /**
      * If we get location updates with time difference <= mFixTime mFixed =>
      * true
      */
-    final int mFixTime = 3;
+    @SuppressWarnings("FieldCanBeLocal")
+    private final int mFixTime = 3;
 
-    int mKnownSatellites = 0;
-    int mUsedInLastFixSatellites = 0;
+    private int mKnownSatellites = 0;
+    private int mUsedInLastFixSatellites = 0;
 
     public GpsStatus(Context ctx) {
         this.context = ctx;
@@ -159,9 +160,12 @@ public void onGpsStatusChanged(int event) {
         if (locationManager == null)
             return;
 
-        //noinspection MissingPermission
-        android.location.GpsStatus gpsStatus = locationManager
-                .getGpsStatus(null);
+        android.location.GpsStatus gpsStatus;
+        try {
+            gpsStatus = locationManager.getGpsStatus(null);
+        } catch (SecurityException ex) {
+            gpsStatus = null;
+        }
 
         if (gpsStatus == null)
             return;
@@ -206,6 +210,7 @@ public int getSatellitesFixed() {
         return mUsedInLastFixSatellites;
     }
 
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     public boolean isEnabled() {
         LocationManager lm = (LocationManager) context
                 .getSystemService(Context.LOCATION_SERVICE);
diff --git a/app/src/org/runnerup/tracker/LocationListenerBase.java b/app/src/org/runnerup/tracker/LocationListenerBase.java
index 33a2cdd58..607fec5f0 100644
--- a/app/src/org/runnerup/tracker/LocationListenerBase.java
+++ b/app/src/org/runnerup/tracker/LocationListenerBase.java
@@ -17,10 +17,8 @@
 
 package org.runnerup.tracker;
 
-import android.annotation.TargetApi;
 import android.location.Location;
 import android.location.LocationListener;
-import android.os.Build;
 import android.os.Bundle;
 /**
  * Base class for writing chained LocationListener(s)
@@ -29,10 +27,10 @@
  * 
  */
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class LocationListenerBase implements LocationListener {
 
-    private final java.util.LinkedList<LocationListener> mClients = new java.util.LinkedList<LocationListener>();
+    private final java.util.LinkedList<LocationListener> mClients = new java.util.LinkedList<>();
 
     public void register(LocationListener l) {
         synchronized (mClients) {
diff --git a/app/src/org/runnerup/tracker/Tracker.java b/app/src/org/runnerup/tracker/Tracker.java
index 4785ae5ea..0a57d1726 100644
--- a/app/src/org/runnerup/tracker/Tracker.java
+++ b/app/src/org/runnerup/tracker/Tracker.java
@@ -17,7 +17,7 @@
 
 package org.runnerup.tracker;
 
-import android.annotation.TargetApi;
+import android.annotation.SuppressLint;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
@@ -77,65 +77,65 @@
  * @author jonas.oreland@gmail.com
  */
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class Tracker extends android.app.Service implements
         LocationListener, Constants {
-    public static final int MAX_HR_AGE = 3000; // 3s
+    private static final int MAX_HR_AGE = 3000; // 3s
 
     private final Handler handler = new Handler();
 
-    TrackerComponentCollection components = new TrackerComponentCollection();
+    private final TrackerComponentCollection components = new TrackerComponentCollection();
     //Some trackers may select separate sensors depending on sport, handled in onBind()
-    TrackerGPS trackerGPS = (TrackerGPS) components.addComponent(new TrackerGPS(this));
-    TrackerHRM trackerHRM = (TrackerHRM) components.addComponent(new TrackerHRM());
+    private final TrackerGPS trackerGPS = (TrackerGPS) components.addComponent(new TrackerGPS(this));
+    private final TrackerHRM trackerHRM = (TrackerHRM) components.addComponent(new TrackerHRM());
     TrackerTTS trackerTTS = (TrackerTTS) components.addComponent(new TrackerTTS());
-    private TrackerCadence trackerCadence = (TrackerCadence) components.addComponent(new TrackerCadence());
-    private TrackerTemperature trackerTemperature = (TrackerTemperature) components.addComponent(new TrackerTemperature());
-    private TrackerPressure trackerPressure = (TrackerPressure) components.addComponent(new TrackerPressure());
-    private TrackerElevation trackerElevation = (TrackerElevation) components.addComponent(new TrackerElevation(this, trackerGPS, trackerPressure));
+    private final TrackerCadence trackerCadence = (TrackerCadence) components.addComponent(new TrackerCadence());
+    private final TrackerTemperature trackerTemperature = (TrackerTemperature) components.addComponent(new TrackerTemperature());
+    private final TrackerPressure trackerPressure = (TrackerPressure) components.addComponent(new TrackerPressure());
+    private final TrackerElevation trackerElevation = (TrackerElevation) components.addComponent(new TrackerElevation(this, trackerGPS, trackerPressure));
     TrackerReceiver trackerReceiver = (TrackerReceiver) components.addComponent(
             new TrackerReceiver(this));
-    TrackerWear trackerWear; // created if version is sufficient
-    TrackerPebble trackerPebble; // created if version is sufficient
+    private TrackerWear trackerWear; // created if version is sufficient
+    private TrackerPebble trackerPebble; // created if version is sufficient
     /**
      * Work-around for http://code.google.com/p/android/issues/detail?id=23937
      */
-    boolean mBug23937Checked = false;
-    long mBug23937Delta = 0;
+    private boolean mBug23937Checked = false;
+    private long mBug23937Delta = 0;
 
     /**
 	 *
 	 */
-    long mLapId = 0;
-    long mActivityId = 0;
-    long mElapsedTimeMillis = 0;
-    double mElapsedDistance = 0;
-    double mHeartbeats = 0;
-    double mHeartbeatMillis = 0; // since we might loose HRM connectivity...
-    long mMaxHR = 0;
+    private long mLapId = 0;
+    private long mActivityId = 0;
+    private long mElapsedTimeMillis = 0;
+    private double mElapsedDistance = 0;
+    private double mHeartbeats = 0;
+    private double mHeartbeatMillis = 0; // since we might loose HRM connectivity...
+    private long mMaxHR = 0;
 
     final boolean mWithoutGps = false;
 
-    TrackerState nextState; //
-    final ValueModel<TrackerState> state = new ValueModel<TrackerState>(TrackerState.INIT);
-    int mLocationType = DB.LOCATION.TYPE_START;
+    private TrackerState nextState; //
+    private final ValueModel<TrackerState> state = new ValueModel<>(TrackerState.INIT);
+    private int mLocationType = DB.LOCATION.TYPE_START;
 
     /**
      * Last location given by LocationManager
      */
-    Location mLastLocation = null;
+    private Location mLastLocation = null;
     //Second to last location - to get speed
-    Location mLast2Location = null;
+    private Location mLast2Location = null;
 
     /**
      * Last location given by LocationManager when in state STARTED
      */
-    Location mActivityLastLocation = null;
+    private Location mActivityLastLocation = null;
 
-    SQLiteDatabase mDB = null;
-    PersistentGpsLoggerListener mDBWriter = null;
-    PowerManager.WakeLock mWakeLock = null;
-    final List<WorkoutObserver> liveLoggers = new ArrayList<WorkoutObserver>();
+    private SQLiteDatabase mDB = null;
+    private PersistentGpsLoggerListener mDBWriter = null;
+    private PowerManager.WakeLock mWakeLock = null;
+    private final List<WorkoutObserver> liveLoggers = new ArrayList<>();
 
     private Workout workout = null;
 
@@ -194,7 +194,7 @@ public void setup() {
                 if (BuildConfig.DEBUG) { throw new AssertionError(); }
                 return;
             case CLEANUP:
-                /**
+                /*
                  * if CLEANUP is in progress, setup will continue once complete
                  */
                 nextState = TrackerState.INITIALIZING;
@@ -320,11 +320,12 @@ private long getBug23937Delta() {
         return mBug23937Delta;
     }
 
+    @SuppressWarnings("UnusedReturnValue")
     private long createActivity(int sport) {
         Resources res = getResources();
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         boolean logGpxAccuracy = prefs.getBoolean(res.getString(R.string.pref_log_gpx_accuracy), false);
-        /**
+        /*
          * Create an Activity instance
          */
         ContentValues tmp = new ContentValues();
@@ -349,14 +350,14 @@ public void start() {
         // connect workout and tracker
         workout.setTracker(this);
 
-        /** Add Wear to live loggers if it's active */
+        /* Add Wear to live loggers if it's active */
         if (components.getResultCode(TrackerWear.NAME) == TrackerComponent.ResultCode.RESULT_OK)
             liveLoggers.add(trackerWear);
 
         if (components.getResultCode(TrackerPebble.NAME) == TrackerComponent.ResultCode.RESULT_OK)
             liveLoggers.add(trackerPebble);
 
-        /**
+        /*
          * create the DB activity
          */
         createActivity(workout.getSport());
@@ -385,17 +386,17 @@ public void start() {
 
         activityOngoingState = new OngoingState(new Formatter(this), workout, this);
 
-        /**
+        /*
          * And finally let workout know that we started
          */
         workout.onStart(Scope.ACTIVITY, this.workout);
     }
 
     private void doBind() {
-        /**
+        /*
          * Let components populate bindValues
          */
-        HashMap<String, Object> bindValues = new HashMap<String, Object>();
+        HashMap<String, Object> bindValues = new HashMap<>();
         Context ctx = getApplicationContext();
         bindValues.put(TrackerComponent.KEY_CONTEXT, ctx);
         bindValues.put(Workout.KEY_FORMATTER, new Formatter(ctx));
@@ -406,7 +407,7 @@ private void doBind() {
 
         components.onBind(bindValues);
 
-        /**
+        /*
          * and then give them to workout
          */
         workout.onBind(workout, bindValues);
@@ -446,7 +447,7 @@ public void pause() {
         state.set(TrackerState.PAUSED);
         setNextLocationType(DB.LOCATION.TYPE_PAUSE);
         if (mActivityLastLocation != null) {
-            /**
+            /*
              * This saves mLastLocation as a PAUSE location
              */
             internalOnLocationChanged(mActivityLastLocation);
@@ -474,7 +475,7 @@ public void stop() {
         state.set(TrackerState.STOPPED);
         setNextLocationType(DB.LOCATION.TYPE_PAUSE);
         if (mActivityLastLocation != null) {
-            /**
+            /*
              * This saves mLastLocation as a PAUSE location
              */
             internalOnLocationChanged(mActivityLastLocation);
@@ -514,7 +515,7 @@ public void resume() {
         state.set(TrackerState.STARTED);
         setNextLocationType(DB.LOCATION.TYPE_RESUME);
         if (mActivityLastLocation != null) {
-            /**
+            /*
              * save last know location as resume location
              */
             internalOnLocationChanged(mActivityLastLocation);
@@ -626,7 +627,7 @@ private void saveActivity() {
         mDB.update(DB.ACTIVITY.TABLE, tmp, "_id = ?", key);
     }
 
-    void setNextLocationType(int newType) {
+    private void setNextLocationType(int newType) {
         ContentValues key = mDBWriter.getKey();
         key.put(DB.LOCATION.TYPE, newType);
         mDBWriter.setKey(key);
@@ -774,6 +775,7 @@ public IBinder onBind(Intent intent) {
         return mBinder;
     }
 
+    @SuppressLint("Wakelock")
     private void wakeLock(boolean get) {
         if (mWakeLock != null) {
             if (mWakeLock.isHeld()) {
@@ -787,7 +789,8 @@ private void wakeLock(boolean get) {
             mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
                     "RunnerUp");
             if (mWakeLock != null) {
-                mWakeLock.acquire();
+                //Set a timeout, this is before activity is started
+                mWakeLock.acquire(300000);
             }
         }
     }
@@ -836,7 +839,7 @@ public HRProvider getHRProvider() {
         return (trackerHRM.getHrProvider());
     }
 
-    public Integer getCurrentHRValue(long now, long maxAge) {
+    private Integer getCurrentHRValue(long now, long maxAge) {
         HRProvider hrProvider = trackerHRM.getHrProvider();
         if (hrProvider == null)
             return null;
diff --git a/app/src/org/runnerup/tracker/WorkoutObserver.java b/app/src/org/runnerup/tracker/WorkoutObserver.java
index c986c5231..0b937a2ac 100644
--- a/app/src/org/runnerup/tracker/WorkoutObserver.java
+++ b/app/src/org/runnerup/tracker/WorkoutObserver.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (C) 2014 niklas.weidemann
+ *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
@@ -16,10 +18,7 @@
 
 import org.runnerup.workout.WorkoutInfo;
 
-/**
- * Created by niklas.weidemann on 2014-10-13.
- */
 public interface WorkoutObserver {
     // @note: type is in Constants.DB.LOCATION.TYPE
-    public void workoutEvent(WorkoutInfo workoutInfo, int type);
+    void workoutEvent(WorkoutInfo workoutInfo, int type);
 }
diff --git a/app/src/org/runnerup/tracker/component/DefaultTrackerComponent.java b/app/src/org/runnerup/tracker/component/DefaultTrackerComponent.java
index 3a23a745a..d394a154b 100644
--- a/app/src/org/runnerup/tracker/component/DefaultTrackerComponent.java
+++ b/app/src/org/runnerup/tracker/component/DefaultTrackerComponent.java
@@ -16,9 +16,7 @@
  */
 package org.runnerup.tracker.component;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 
 import java.util.HashMap;
 
@@ -26,7 +24,7 @@
  * Created by jonas on 12/11/14.
  *
  */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public abstract class DefaultTrackerComponent implements TrackerComponent {
 
     /**
diff --git a/app/src/org/runnerup/tracker/component/HeadsetButtonReceiver.java b/app/src/org/runnerup/tracker/component/HeadsetButtonReceiver.java
index db0bd99f5..f5f900671 100644
--- a/app/src/org/runnerup/tracker/component/HeadsetButtonReceiver.java
+++ b/app/src/org/runnerup/tracker/component/HeadsetButtonReceiver.java
@@ -17,21 +17,19 @@
 
 package org.runnerup.tracker.component;
 
-import android.annotation.TargetApi;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.media.AudioManager;
-import android.os.Build;
 import android.preference.PreferenceManager;
 import android.view.KeyEvent;
 
 import org.runnerup.R;
 import org.runnerup.common.util.Constants;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class HeadsetButtonReceiver extends BroadcastReceiver {
 
     public static void registerHeadsetListener(Context context) {
diff --git a/app/src/org/runnerup/tracker/component/TrackerComponent.java b/app/src/org/runnerup/tracker/component/TrackerComponent.java
index 363bdbd71..1f5f52c7f 100644
--- a/app/src/org/runnerup/tracker/component/TrackerComponent.java
+++ b/app/src/org/runnerup/tracker/component/TrackerComponent.java
@@ -16,9 +16,7 @@
  */
 package org.runnerup.tracker.component;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 
 import java.util.HashMap;
 
@@ -29,12 +27,12 @@
  * typically a sensor but could also be a system service that
  * needs blocking initialization (with callback)
  */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public interface TrackerComponent {
 
-    public static final String KEY_CONTEXT = "KEY_CONTEXT";
+    String KEY_CONTEXT = "KEY_CONTEXT";
 
-    public enum ResultCode {
+    enum ResultCode {
         RESULT_OK,
         RESULT_UNKNOWN,       // we don't know if hw is present
         RESULT_NOT_SUPPORTED, // hw not present or not configured
@@ -44,14 +42,14 @@ public enum ResultCode {
         RESULT_PENDING        // will call callback
     }
 
-    public interface Callback {
+    interface Callback {
         void run(TrackerComponent component, ResultCode resultCode);
     }
 
     /**
      * Component name
      */
-    public String getName();
+    String getName();
 
     /**
      * Called by Tracker during initialization
diff --git a/app/src/org/runnerup/tracker/component/TrackerComponentCollection.java b/app/src/org/runnerup/tracker/component/TrackerComponentCollection.java
index 21f053232..8f5b7fa04 100644
--- a/app/src/org/runnerup/tracker/component/TrackerComponentCollection.java
+++ b/app/src/org/runnerup/tracker/component/TrackerComponentCollection.java
@@ -16,9 +16,7 @@
  */
 package org.runnerup.tracker.component;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.os.Handler;
 import android.util.Log;
 import android.util.Pair;
@@ -31,18 +29,18 @@
  *
  * Class for managing a set of TrackerComponents as if they were one
  */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class TrackerComponentCollection implements TrackerComponent {
 
-    final Handler handler = new Handler();
-    final HashMap<String, Pair<TrackerComponent, ResultCode>> components =
-            new HashMap<String, Pair<TrackerComponent, ResultCode>>();
-    final HashMap<String, TrackerComponent> pending =
-            new HashMap<String, TrackerComponent>();
+    private final Handler handler = new Handler();
+    private final HashMap<String, Pair<TrackerComponent, ResultCode>> components =
+            new HashMap<>();
+    private final HashMap<String, TrackerComponent> pending =
+            new HashMap<>();
 
     public TrackerComponent addComponent(TrackerComponent component) {
         components.put(component.getName(),
-                new Pair<TrackerComponent, ResultCode>(component, ResultCode.RESULT_OK));
+                new Pair<>(component, ResultCode.RESULT_OK));
         return component;
     }
 
@@ -215,12 +213,12 @@ private ResultCode forEach(final String msg, final Func1 func, final Callback ca
                                Context context) {
         synchronized (components) {
             HashMap<String, Pair<TrackerComponent, ResultCode>> list =
-                    new HashMap<String, Pair<TrackerComponent, ResultCode>>();
+                    new HashMap<>();
             list.putAll(components);
             components.clear();
 
             for (TrackerComponent component : pending.values()) {
-                list.put(component.getName(), new Pair<TrackerComponent, ResultCode>(component, ResultCode.RESULT_PENDING));
+                list.put(component.getName(), new Pair<>(component, ResultCode.RESULT_PENDING));
             }
             pending.clear();
 
@@ -243,7 +241,7 @@ public void run() {
                                         Log.e(getName(), component.getName() + " != " + check.getName());
                                         throw new AssertionError();
                                     }
-                                    components.put(key, new Pair<TrackerComponent, ResultCode>(
+                                    components.put(key, new Pair<>(
                                             component, resultCode));
                                     if (pending.isEmpty()) {
                                         Log.e(getName(), " => runCallback()");
@@ -257,7 +255,7 @@ public void run() {
                 }, context);
                 Log.e(getName(), component.getName() + " " + msg + " => " + res);
                 if (res != ResultCode.RESULT_PENDING) {
-                    components.put(key, new Pair<TrackerComponent, ResultCode>(component, res));
+                    components.put(key, new Pair<>(component, res));
                 } else {
                     pending.put(key, component);
                 }
diff --git a/app/src/org/runnerup/tracker/component/TrackerElevation.java b/app/src/org/runnerup/tracker/component/TrackerElevation.java
index eb73b6fdc..27a60ba95 100644
--- a/app/src/org/runnerup/tracker/component/TrackerElevation.java
+++ b/app/src/org/runnerup/tracker/component/TrackerElevation.java
@@ -24,7 +24,6 @@
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
-import android.os.Build;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
@@ -33,7 +32,6 @@
 import org.runnerup.tracker.Tracker;
 
 import java.io.IOException;
-import java.util.HashMap;
 
 import org.matthiaszimmermann.location.egm96.Geoid;
 
@@ -68,6 +66,7 @@ public TrackerElevation(Tracker tracker, TrackerGPS trackerGPS, TrackerPressure
     public Double getValue() {
         Double val;
         Float pressure = tracker.getCurrentPressure();
+        //noinspection ConstantConditions
         if (pressure != null && BuildConfig.VERSION_CODE >= 9) {
             //Pressure available - use it for elevation
             //TODO get real sea level pressure (online) or set offset from start/end
@@ -127,7 +126,7 @@ public void onSensorChanged(SensorEvent event) { }
     public void onAccuracyChanged(Sensor sensor, int accuracy) {
     }
 
-    /**
+    /*
      * Sensor is available
      */
     //@SuppressWarnings("unused")
@@ -175,7 +174,7 @@ public boolean isConnected() {
     public void onConnected() {
     }
 
-    /**
+    /*
      * Called by Tracker before start
      *   Component shall populate bindValues
      *   with objects that will then be passed
diff --git a/app/src/org/runnerup/tracker/component/TrackerGPS.java b/app/src/org/runnerup/tracker/component/TrackerGPS.java
index 4ccf6c969..a5877faa9 100644
--- a/app/src/org/runnerup/tracker/component/TrackerGPS.java
+++ b/app/src/org/runnerup/tracker/component/TrackerGPS.java
@@ -17,13 +17,11 @@
 package org.runnerup.tracker.component;
 
 import android.Manifest;
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.location.Location;
 import android.location.LocationManager;
-import android.os.Build;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.support.v4.content.ContextCompat;
@@ -37,10 +35,7 @@
 import static android.location.LocationManager.NETWORK_PROVIDER;
 import static android.location.LocationManager.PASSIVE_PROVIDER;
 
-/**
- * Created by jonas on 12/11/14.
- */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class TrackerGPS extends DefaultTrackerComponent implements TickListener {
 
     private boolean mWithoutGps = false;
diff --git a/app/src/org/runnerup/tracker/component/TrackerHRM.java b/app/src/org/runnerup/tracker/component/TrackerHRM.java
index 2b6cad308..1eb8208a7 100644
--- a/app/src/org/runnerup/tracker/component/TrackerHRM.java
+++ b/app/src/org/runnerup/tracker/component/TrackerHRM.java
@@ -16,11 +16,9 @@
  */
 package org.runnerup.tracker.component;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
-import android.os.Build;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.widget.Toast;
@@ -30,10 +28,7 @@
 import org.runnerup.hr.HRManager;
 import org.runnerup.hr.HRProvider;
 
-/**
- * Created by jonas on 12/11/14.
- */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class TrackerHRM extends DefaultTrackerComponent {
 
     private final Handler handler = new Handler();
diff --git a/app/src/org/runnerup/tracker/component/TrackerPressure.java b/app/src/org/runnerup/tracker/component/TrackerPressure.java
index b08ed69b8..f86298b06 100644
--- a/app/src/org/runnerup/tracker/component/TrackerPressure.java
+++ b/app/src/org/runnerup/tracker/component/TrackerPressure.java
@@ -24,7 +24,6 @@
 
 import org.runnerup.BuildConfig;
 
-import java.util.HashMap;
 import java.util.Random;
 
 public class TrackerPressure extends DefaultTrackerComponent implements SensorEventListener {
@@ -136,7 +135,7 @@ public boolean isConnected() {
     public void onConnected() {
     }
 
-    /**
+    /*
      * Called by Tracker before start
      *   Component shall populate bindValues
      *   with objects that will then be passed
diff --git a/app/src/org/runnerup/tracker/component/TrackerReceiver.java b/app/src/org/runnerup/tracker/component/TrackerReceiver.java
index 256bce235..7629b304b 100644
--- a/app/src/org/runnerup/tracker/component/TrackerReceiver.java
+++ b/app/src/org/runnerup/tracker/component/TrackerReceiver.java
@@ -16,29 +16,24 @@
  */
 package org.runnerup.tracker.component;
 
-import android.annotation.TargetApi;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.os.Build;
 import android.support.v4.content.LocalBroadcastManager;
 
 import org.runnerup.common.util.Constants;
 import org.runnerup.tracker.Tracker;
 import org.runnerup.workout.Workout;
 
-/**
- * Created by jonas on 12/11/14.
- */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class TrackerReceiver extends DefaultTrackerComponent {
 
-    private Tracker tracker;
+    private final Tracker tracker;
     private Context context;
     private boolean headsetRegistered = false;
 
-    public static final String NAME = "Receiver";
+    private static final String NAME = "Receiver";
 
     public TrackerReceiver(Tracker tracker) {
         this.tracker = tracker;
@@ -113,19 +108,15 @@ private void onReceive(Context context, Intent intent) {
                 workout.onResume(workout);
             else
                 workout.onPause(workout);
-            return;
         } else if (Constants.Intents.NEW_LAP.contentEquals(action)) {
             workout.onNewLapOrNextStep();
-            return;
         } else if (Constants.Intents.PAUSE_WORKOUT.contentEquals(action)) {
             if (workout.isPaused())
                 return;
             workout.onPause(workout);
-            return;
         } else if (Constants.Intents.RESUME_WORKOUT.contentEquals(action)) {
             if (workout.isPaused())
                 workout.onResume(workout);
-            return;
         }
     }
 
diff --git a/app/src/org/runnerup/tracker/component/TrackerTTS.java b/app/src/org/runnerup/tracker/component/TrackerTTS.java
index 43604f69a..3f0160a4d 100644
--- a/app/src/org/runnerup/tracker/component/TrackerTTS.java
+++ b/app/src/org/runnerup/tracker/component/TrackerTTS.java
@@ -16,10 +16,8 @@
  */
 package org.runnerup.tracker.component;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.os.Build;
 import android.speech.tts.TextToSpeech;
 
 import org.runnerup.R;
@@ -28,17 +26,13 @@
 
 import java.util.HashMap;
 
-/**
- * Created by jonas on 12/11/14.
- */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class TrackerTTS extends DefaultTrackerComponent {
 
     private TextToSpeech tts;
     private Context context;
-    private RUTextToSpeech ruTTS;
 
-    public static final String NAME = "TTS";
+    private static final String NAME = "TTS";
 
     @Override
     public String getName() {
@@ -80,7 +74,6 @@ public ResultCode onEnd(Callback callback, Context context) {
 
     RUTextToSpeech getTTS(SharedPreferences prefs) {
         final boolean mute = prefs.getBoolean(context.getString(R.string.pref_mute_bool), false);
-        ruTTS = new RUTextToSpeech(tts, mute, context);
-        return ruTTS;
+        return new RUTextToSpeech(tts, mute, context);
     }
 }
diff --git a/app/src/org/runnerup/tracker/component/TrackerTemperature.java b/app/src/org/runnerup/tracker/component/TrackerTemperature.java
index d015e3d63..834af6fac 100644
--- a/app/src/org/runnerup/tracker/component/TrackerTemperature.java
+++ b/app/src/org/runnerup/tracker/component/TrackerTemperature.java
@@ -17,6 +17,7 @@
 
 package org.runnerup.tracker.component;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.hardware.*;
@@ -25,7 +26,6 @@
 
 import org.runnerup.BuildConfig;
 
-import java.util.HashMap;
 import java.util.Random;
 
 public class TrackerTemperature extends DefaultTrackerComponent implements SensorEventListener {
@@ -76,6 +76,7 @@ public static boolean isAvailable(final Context context) {
         return ((new TrackerTemperature()).getSensor(context) != null) || testMode;
     }
 
+    @SuppressLint("ObsoleteSdkInt")
     private Sensor getSensor(final Context context) {
         Sensor sensor = null;
         if (sensorManager == null) {
@@ -136,7 +137,7 @@ public boolean isConnected() {
     public void onConnected() {
     }
 
-    /**
+    /*
      * Called by Tracker before start
      *   Component shall populate bindValues
      *   with objects that will then be passed
diff --git a/app/src/org/runnerup/tracker/filter/PersistentGpsLoggerListener.java b/app/src/org/runnerup/tracker/filter/PersistentGpsLoggerListener.java
index f4c3f9318..20d8d5082 100644
--- a/app/src/org/runnerup/tracker/filter/PersistentGpsLoggerListener.java
+++ b/app/src/org/runnerup/tracker/filter/PersistentGpsLoggerListener.java
@@ -17,24 +17,21 @@
 
 package org.runnerup.tracker.filter;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.database.sqlite.SQLiteDatabase;
 import android.location.Location;
-import android.os.Build;
-import android.os.Bundle;
 
 import org.runnerup.common.util.Constants;
 import org.runnerup.tracker.LocationListenerBase;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class PersistentGpsLoggerListener extends LocationListenerBase implements
         Constants {
     private final java.lang.Object mLock;
     private SQLiteDatabase mDB;
     private java.lang.String mTable;
     private ContentValues mKey;
-    private boolean mLogGpxAccuracy;
+    private final boolean mLogGpxAccuracy;
 
     public PersistentGpsLoggerListener(SQLiteDatabase _db, String _table,
             ContentValues _key, boolean logGpxAccuracy) {
@@ -140,19 +137,4 @@ public void onLocationChanged(Location arg0, Double eleValue, Long elapsed, Doub
             mDB.insert(mTable, null, values);
         }
     }
-
-    @Override
-    public void onProviderDisabled(String arg0) {
-        super.onProviderDisabled(arg0);
-    }
-
-    @Override
-    public void onProviderEnabled(String arg0) {
-        super.onProviderEnabled(arg0);
-    }
-
-    @Override
-    public void onStatusChanged(String arg0, int arg1, Bundle arg2) {
-        super.onStatusChanged(arg0, arg1, arg2);
-    }
 }
diff --git a/app/src/org/runnerup/util/Bitfield.java b/app/src/org/runnerup/util/Bitfield.java
index 06a2e4ac8..e455dbefd 100644
--- a/app/src/org/runnerup/util/Bitfield.java
+++ b/app/src/org/runnerup/util/Bitfield.java
@@ -17,10 +17,7 @@
 
 package org.runnerup.util;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
 public class Bitfield {
 
     public static boolean test(long flags, int bit) {
@@ -35,12 +32,12 @@ public static long set(long flags, int bit, boolean value) {
             return clear(flags, bit);
     }
 
-    public static long set(long flags, int bit) {
+    private static long set(long flags, int bit) {
         long val = (1 << bit);
         return flags | val;
     }
 
-    public static long clear(long flags, int bit) {
+    private static long clear(long flags, int bit) {
         long val = (1 << bit);
         return flags & (~val);
     }
diff --git a/app/src/org/runnerup/util/Encryption.java b/app/src/org/runnerup/util/Encryption.java
index febb08415..afd111247 100644
--- a/app/src/org/runnerup/util/Encryption.java
+++ b/app/src/org/runnerup/util/Encryption.java
@@ -17,8 +17,7 @@
 
 package org.runnerup.util;
 
-import android.annotation.TargetApi;
-import android.os.Build;
+import android.annotation.SuppressLint;
 import android.util.Base64;
 
 import java.io.FileInputStream;
@@ -39,7 +38,7 @@
 import javax.crypto.spec.PBEParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class Encryption {
     private static final String HMAC_SHA1_ALGORITHM = "HmacSHA1";
 
@@ -82,7 +81,8 @@ public static String calculateRFC2104HMAC(final String data, final String key)
      * @param key
      * @throws Exception
      */
-    public static void encrypt(final InputStream in, final OutputStream out, final String key)
+    @SuppressLint("TrulyRandom")
+    private static void encrypt(final InputStream in, final OutputStream out, final String key)
             throws Exception {
         final PBEKeySpec keySpec = new PBEKeySpec(key.toCharArray());
         final SecretKeyFactory keyFactory = SecretKeyFactory
@@ -138,6 +138,7 @@ public static void decrypt(final InputStream in, final OutputStream out, final S
 
         // Read in the previously stored salt and set the iteration count.
         final byte[] salt = new byte[8];
+        //noinspection ResultOfMethodCallIgnored
         in.read(salt);
         final int iterations = 100;
         final PBEParameterSpec parameterSpec = new PBEParameterSpec(salt, iterations);
diff --git a/app/src/org/runnerup/util/FileUtil.java b/app/src/org/runnerup/util/FileUtil.java
index d2618be56..bcd96a2f2 100644
--- a/app/src/org/runnerup/util/FileUtil.java
+++ b/app/src/org/runnerup/util/FileUtil.java
@@ -17,19 +17,16 @@
 
 package org.runnerup.util;
 
-import android.annotation.TargetApi;
-import android.os.Build;
-
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class FileUtil {
 
-    public static int copy(InputStream src, OutputStream dst) throws IOException {
+    private static int copy(InputStream src, OutputStream dst) throws IOException {
         int cnt = 0;
         byte buf[] = new byte[1024];
         while (src.read(buf) > 0) {
@@ -62,7 +59,7 @@ public static void close(InputStream input) {
             }
     }
 
-    public static void close(OutputStream input) {
+    private static void close(OutputStream input) {
         if (input != null)
             try {
                 input.close();
@@ -70,6 +67,7 @@ public static void close(OutputStream input) {
             }
     }
 
+    @SuppressWarnings("UnusedReturnValue")
     public static int copy(InputStream input, String dst) throws IOException {
         FileOutputStream output = null;
 
diff --git a/app/src/org/runnerup/util/Formatter.java b/app/src/org/runnerup/util/Formatter.java
index 6acf528b6..b026835f4 100644
--- a/app/src/org/runnerup/util/Formatter.java
+++ b/app/src/org/runnerup/util/Formatter.java
@@ -17,7 +17,6 @@
 
 package org.runnerup.util;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
@@ -35,7 +34,7 @@
 import java.text.DecimalFormat;
 import java.util.Locale;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class Formatter implements OnSharedPreferenceChangeListener {
 
     private Context context = null;
@@ -162,7 +161,7 @@ public String getCueString(int msgId) {
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
-            String key) {
+                                          String key) {
         if (key != null && context.getString(R.string.pref_unit).contentEquals(key))
             setUnit();
     }
@@ -220,8 +219,7 @@ private static boolean guessDefaultUnit(Resources res, SharedPreferences prefs,
             if (editor != null)
                 editor.putString(key, "mi");
             return false;
-        }
-        else {
+        } else {
             if (editor != null)
                 editor.putString(key, "km");
         }
@@ -232,6 +230,10 @@ public double getUnitMeters() {
         return this.base_meters;
     }
 
+    public int getUnitDecimals() {
+        return 3;
+    }
+
     public static double getUnitMeters(Resources res, SharedPreferences prefs) {
         if (getUseKilometers(res, prefs, null))
             return km_meters;
@@ -299,20 +301,20 @@ private String cueElapsedTime(long seconds, boolean includeDimension) {
         StringBuilder s = new StringBuilder();
         if (hours > 0) {
             includeDimension = true;
-            s.append(cueResources.getQuantityString(R.plurals.cue_hour, (int)hours, (int)hours));
+            s.append(cueResources.getQuantityString(R.plurals.cue_hour, (int) hours, (int) hours));
         }
         if (minutes > 0) {
             if (hours > 0)
                 s.append(" ");
             includeDimension = true;
-            s.append(cueResources.getQuantityString(R.plurals.cue_minute, (int)minutes, (int)minutes));
+            s.append(cueResources.getQuantityString(R.plurals.cue_minute, (int) minutes, (int) minutes));
         }
         if (seconds > 0) {
             if (hours > 0 || minutes > 0)
                 s.append(" ");
 
             if (includeDimension) {
-                s.append(cueResources.getQuantityString(R.plurals.cue_second, (int)seconds, (int)seconds));
+                s.append(cueResources.getQuantityString(R.plurals.cue_second, (int) seconds, (int) seconds));
             } else {
                 s.append(seconds);
             }
@@ -380,13 +382,13 @@ public String formatHeartRate(Format target, double heart_rate) {
      * @param val
      * @return
      */
-    public String formatCadence(Format target, double val) {
+    private String formatCadence(Format target, double val) {
         switch (target) {
             case CUE:
             case CUE_SHORT:
             case CUE_LONG:
                 return Integer.toString((int) Math.round(val)) + " "
-                        + cueResources.getQuantityString(R.plurals.cue_bpm, (int)val, (int)val);
+                        + cueResources.getQuantityString(R.plurals.cue_bpm, (int) val, (int) val);
             case TXT:
             case TXT_SHORT:
             case TXT_LONG:
@@ -415,7 +417,7 @@ private String formatHeartRateZone(Format target, double hrZone) {
 
     /**
      * Format pace
-     * 
+     *
      * @param target
      * @param seconds_per_meter
      * @return
@@ -472,17 +474,17 @@ private String cuePace(double seconds_per_meter) {
         }
         StringBuilder s = new StringBuilder();
         if (hours_per_unit > 0) {
-            s.append(cueResources.getQuantityString(R.plurals.cue_hour, (int)hours_per_unit, (int)hours_per_unit));
+            s.append(cueResources.getQuantityString(R.plurals.cue_hour, (int) hours_per_unit, (int) hours_per_unit));
         }
         if (minutes_per_unit > 0) {
             if (hours_per_unit > 0)
                 s.append(" ");
-            s.append(cueResources.getQuantityString(R.plurals.cue_minute, (int)minutes_per_unit, (int)minutes_per_unit));
+            s.append(cueResources.getQuantityString(R.plurals.cue_minute, (int) minutes_per_unit, (int) minutes_per_unit));
         }
         if (seconds_per_unit > 0) {
             if (hours_per_unit > 0 || minutes_per_unit > 0)
                 s.append(" ");
-            s.append(cueResources.getQuantityString(R.plurals.cue_second, (int)seconds_per_unit, (int)seconds_per_unit));
+            s.append(cueResources.getQuantityString(R.plurals.cue_second, (int) seconds_per_unit, (int) seconds_per_unit));
         }
         s.append(" ").append(cueResources.getString(km ? R.string.cue_perkilometer : R.string.cue_permile));
         return s.toString();
@@ -495,7 +497,7 @@ private String cuePace(double seconds_per_meter) {
      * @param seconds_per_meter
      * @return
      */
-    public String formatSpeed(Format target, double seconds_per_meter) {
+    private String formatSpeed(Format target, double seconds_per_meter) {
         switch (target) {
             case CUE:
             case CUE_SHORT:
@@ -534,7 +536,7 @@ private String cueSpeed(double meter_per_seconds) {
         double distance_per_hour = distance_per_seconds * 3600;
         String fmtDistPerHour = txtSpeed(meter_per_seconds, false);
         return cueResources.getQuantityString(km ? R.plurals.cue_kilometers_per_hour : R.plurals.cue_miles_per_hour,
-                (int)distance_per_hour, fmtDistPerHour);
+                (int) distance_per_hour, fmtDistPerHour);
     }
 
     /**
@@ -544,7 +546,7 @@ private String cueSpeed(double meter_per_seconds) {
     public String formatDateTime(long seconds_since_epoch) {
         // ignore target
         // milliseconds
-                                                                 // as argument
+        // as argument
         return dateFormat.format(seconds_since_epoch * 1000) +
                 " " +
                 timeFormat.format(seconds_since_epoch * 1000);
@@ -552,10 +554,21 @@ public String formatDateTime(long seconds_since_epoch) {
 
     /**
      * @param target
-     * @param meters
+     * @param value
      * @return
      */
-    public String formatDistance(Format target, long meters) {
+    public String formatDistance(Format target, double value) {
+        return formatDistance(target, value, 0);
+    }
+
+    /**
+     * @param target
+     * @param value
+     * @param decimals
+     * @return
+     */
+    public String formatDistance(Format target, double value, int decimals) {
+        Long meters = Math.round(value);
         switch (target) {
             case CUE:
             case CUE_LONG:
@@ -566,7 +579,22 @@ public String formatDistance(Format target, long meters) {
             case TXT_SHORT:
                 return cueDistance(meters, true);
             case TXT_LONG:
-                return Long.toString(meters) + " m";
+                int i = getUnitDecimals(); //Decimals to display
+                String unit;
+                if (meters == 0) {
+                    //No need for decimals
+                    decimals = 0;
+                    unit = getUnitString();
+                } else if (meters < getUnitMeters()) {
+                    //Short unit, should be feet or yard for non metric for <1.0 mi
+                    unit = resources.getString(R.string.metrics_distance_m);
+                } else {
+                    decimals += getUnitDecimals();
+                    unit = getUnitString();
+                    value = value / getUnitMeters();
+                }
+                return String.format(Locale.getDefault(), "%." + decimals + "f %s", value, unit);
+
         }
         return null;
     }
@@ -592,13 +620,13 @@ private String cueDistance(long meters, boolean txt) {
                         .append(resources.getString(km ? R.string.metrics_distance_km : R.string.metrics_distance_mi));
             } else {
                 s.append(val).append(" ")
-                        .append(cueResources.getQuantityString(km ? R.plurals.cue_kilometer : R.plurals.cue_mile, (int)val, (int)val));
+                        .append(cueResources.getQuantityString(km ? R.plurals.cue_kilometer : R.plurals.cue_mile, (int) val, (int) val));
             }
         } else {
             if (txt)
-                s.append(meters).append(" ").append("m");
+                s.append(meters).append(" ").append(resources.getString(R.string.metrics_distance_m));
             else
-                s.append(cueResources.getQuantityString(R.plurals.cue_meter, (int)meters, (int)meters));
+                s.append(cueResources.getQuantityString(R.plurals.cue_meter, (int) meters, (int) meters));
         }
         return s.toString();
     }
@@ -621,11 +649,11 @@ public String formatRemaining(Format target, Dimension dimension, double value)
         return "";
     }
 
-    public String formatRemainingTime(Format target, double value) {
+    private String formatRemainingTime(Format target, double value) {
         return formatElapsedTime(target, Math.round(value));
     }
 
-    public String formatRemainingDistance(Format target, double value) {
+    private String formatRemainingDistance(Format target, double value) {
         return formatDistance(target, Math.round(value));
     }
 
@@ -634,12 +662,12 @@ public String formatName(String first, String last) {
             return first + " " + last;
         else if (first == null && last != null)
             return last;
-        else if (first != null && last == null)
+        else if (first != null /*&& last == null*/)
             return first;
         return "";
     }
 
-    public String formatTime(long seconds_since_epoch) {
+    private String formatTime(long seconds_since_epoch) {
         return timeFormat.format(seconds_since_epoch * 1000);
     }
 
diff --git a/app/src/org/runnerup/util/GraphWrapper.java b/app/src/org/runnerup/util/GraphWrapper.java
index a08bdecd6..fe4efdd2f 100644
--- a/app/src/org/runnerup/util/GraphWrapper.java
+++ b/app/src/org/runnerup/util/GraphWrapper.java
@@ -17,6 +17,7 @@
 
 package org.runnerup.util;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
@@ -59,6 +60,7 @@ public class GraphWrapper implements Constants {
     /**
      * Called when the activity is first created.
      */
+    @SuppressLint("ObsoleteSdkInt")
     public GraphWrapper(Context context, LinearLayout graphTab, LinearLayout hrzonesBarLayout, final Formatter formatter, SQLiteDatabase mDB, long mID) {
         this.graphTab = graphTab;
         this.hrzonesBarLayout = hrzonesBarLayout;
@@ -502,13 +504,13 @@ private double calculateAverageHr(int[] data) {
         int no = 0;
 
         for (int aData : data) {
-            if (aData> 0) {
-            sum = sum + aData;
+            if (aData > 0) {
+                sum = sum + aData;
                 no++;
+            }
         }
-    }
         //TODO Average of pointe, not over time
-        if(no==0){
+        if (no == 0) {
             return 0;
         } else {
             return (double) sum / no;
@@ -526,6 +528,7 @@ public LoadParam(Context context, SQLiteDatabase mDB, long mID) {
         final long mID;
     }
 
+    @SuppressLint("StaticFieldLeak")
     private class LoadGraph extends AsyncTask<LoadParam, Void, GraphProducer> {
         @Override
         protected GraphProducer doInBackground(LoadParam... params) {
@@ -562,6 +565,7 @@ protected GraphProducer doInBackground(LoadParam... params) {
             return graphData;
         }
 
+        @SuppressLint("ObsoleteSdkInt")
         @Override
         protected void onPostExecute(GraphProducer graphData) {
 
diff --git a/app/src/org/runnerup/util/HRZoneCalculator.java b/app/src/org/runnerup/util/HRZoneCalculator.java
index ec95c75d6..0da71ad6a 100644
--- a/app/src/org/runnerup/util/HRZoneCalculator.java
+++ b/app/src/org/runnerup/util/HRZoneCalculator.java
@@ -17,17 +17,15 @@
 
 package org.runnerup.util;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
-import android.os.Build;
 import android.preference.PreferenceManager;
 import android.util.Pair;
 
 import org.runnerup.R;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class HRZoneCalculator {
 
     public static int computeMaxHR(int age, boolean male) {
@@ -43,7 +41,7 @@ public HRZoneCalculator(Context ctx) {
                 .getDefaultSharedPreferences(ctx));
     }
 
-    public HRZoneCalculator(Resources res, SharedPreferences prefs) {
+    private HRZoneCalculator(Resources res, SharedPreferences prefs) {
         final String pct = res.getString(R.string.pref_hrz_thresholds);
         if (prefs.contains(pct)) {
             int limits[] = SafeParse.parseIntList(prefs.getString(pct, ""));
@@ -53,7 +51,7 @@ public HRZoneCalculator(Resources res, SharedPreferences prefs) {
         }
     }
 
-    int zoneLimitsPct[] = {
+    private int[] zoneLimitsPct = {
             63, // 1
             71, // 2
             78, // 3
@@ -75,10 +73,10 @@ public Pair<Integer, Integer> getZoneLimits(int zone) {
             return null;
 
         if (zone + 1 < zoneLimitsPct.length)
-            return new Pair<Integer, Integer>(zoneLimitsPct[zone],
+            return new Pair<>(zoneLimitsPct[zone],
                     zoneLimitsPct[zone + 1]);
         else
-            return new Pair<Integer, Integer>(zoneLimitsPct[zone], 100);
+            return new Pair<>(zoneLimitsPct[zone], 100);
     }
 
     public Pair<Integer, Integer> computeHRZone(int zone, int maxHR) {
@@ -86,7 +84,7 @@ public Pair<Integer, Integer> computeHRZone(int zone, int maxHR) {
         if (limits == null)
             return null;
 
-        return new Pair<Integer, Integer>((int) Math.round(limits.first * maxHR / 100.0),
+        return new Pair<>((int) Math.round(limits.first * maxHR / 100.0),
                 (int) Math.round(limits.second * maxHR / 100.0d));
     }
 }
diff --git a/app/src/org/runnerup/util/HRZones.java b/app/src/org/runnerup/util/HRZones.java
index 6d9d07cc7..03a8c9cab 100644
--- a/app/src/org/runnerup/util/HRZones.java
+++ b/app/src/org/runnerup/util/HRZones.java
@@ -17,11 +17,9 @@
 
 package org.runnerup.util;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
-import android.os.Build;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.util.Pair;
@@ -30,12 +28,12 @@
 
 import java.util.Vector;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class HRZones {
 
-    int zones[] = null;
-    final String key;
-    final SharedPreferences prefs;
+    private int[] zones = null;
+    private final String key;
+    private final SharedPreferences prefs;
 
     public HRZones(Context ctx) {
         this(ctx.getResources(), PreferenceManager
@@ -76,7 +74,7 @@ public int getCount() {
 
     public double getZone(double value) {
         if (zones != null) {
-            int z = 0;
+            int z;
             for (z = 0; z < zones.length; z++) {
                 if (zones[z] >= value)
                     break;
@@ -100,7 +98,7 @@ public int getZoneInt(double value) {
             return 0;
         }
 
-        int z = 0;
+        int z;
         for (z = 0; z < zones.length; z++) {
             if (zones[z] >= value)
                 return z;
@@ -111,9 +109,9 @@ public int getZoneInt(double value) {
     public Pair<Integer, Integer> getHRValues(int zone) {
         if (zones != null && zone < zones.length) {
             if (zone == 0) {
-                return new Pair<Integer, Integer>(0, zones[0]);
+                return new Pair<>(0, zones[0]);
             } else {
-                return new Pair<Integer, Integer>(zones[zone - 1], zones[zone]);
+                return new Pair<>(zones[zone - 1], zones[zone]);
             }
         }
         return null;
diff --git a/app/src/org/runnerup/util/JsonWriter.java b/app/src/org/runnerup/util/JsonWriter.java
index 6f3b97b97..668f36c74 100644
--- a/app/src/org/runnerup/util/JsonWriter.java
+++ b/app/src/org/runnerup/util/JsonWriter.java
@@ -177,7 +177,7 @@ public final class JsonWriter {
     /** The output data, containing at most one top-level array or object. */
     private final Writer out;
 
-    private final List<JsonScope> stack = new ArrayList<JsonScope>();
+    private final List<JsonScope> stack = new ArrayList<>();
     {
         stack.add(JsonScope.EMPTY_DOCUMENT);
     }
@@ -366,7 +366,7 @@ public JsonWriter value(String value) throws IOException {
      * 
      * @return this writer.
      */
-    public JsonWriter nullValue() throws IOException {
+    private JsonWriter nullValue() throws IOException {
         beforeValue(false);
         out.write("null");
         return this;
diff --git a/app/src/org/runnerup/util/KXmlSerializer.java b/app/src/org/runnerup/util/KXmlSerializer.java
index 580d2c057..eb80d861c 100644
--- a/app/src/org/runnerup/util/KXmlSerializer.java
+++ b/app/src/org/runnerup/util/KXmlSerializer.java
@@ -21,14 +21,13 @@
 
 package org.runnerup.util;
 
-import android.annotation.TargetApi;
-import android.os.Build;
+import android.text.TextUtils;
 
 import java.io.*;
 import java.util.Locale;
 import org.xmlpull.v1.*;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class KXmlSerializer implements XmlSerializer {
 
     //    static final String UNDEFINED = ":";
@@ -56,7 +55,7 @@ public class KXmlSerializer implements XmlSerializer {
     private boolean unicode;
     private String encoding;
 
-    private final void check(boolean close) throws IOException {
+    private void check(boolean close) throws IOException {
         if (!pending)
             return;
 
@@ -73,11 +72,11 @@ private final void check(boolean close) throws IOException {
         for (int i = nspCounts[depth - 1]; i < nspCounts[depth]; i++) {
             writer.write(' ');
             writer.write("xmlns");
-            if (!isEmpty(nspStack[i * 2])) {
+            if (!TextUtils.isEmpty(nspStack[i * 2])) {
                 writer.write(':');
                 writer.write(nspStack[i * 2]);
             }
-            else if (isEmpty(getNamespace()) && !isEmpty(nspStack[i * 2 + 1]))
+            else if (TextUtils.isEmpty(getNamespace()) && !TextUtils.isEmpty(nspStack[i * 2 + 1]))
                 throw new IllegalStateException("Cannot set default namespace for elements in no namespace");
             writer.write("=\"");
             writeEscaped(nspStack[i * 2 + 1], '"');
@@ -96,7 +95,7 @@ else if (isEmpty(getNamespace()) && !isEmpty(nspStack[i * 2 + 1]))
         writer.write(close ? " />" : ">");
     }
 
-    private final void writeEscaped(String s, int quot) throws IOException {
+    private void writeEscaped(String s, int quot) throws IOException {
         for (int i = 0; i < s.length(); i++) {
             char c = s.charAt(i);
             switch (c) {
@@ -190,11 +189,8 @@ public void entityRef(String name) throws IOException {
     public boolean getFeature(String name) {
         //return false;
         return (
-            "http://xmlpull.org/v1/doc/features.html#indent-output"
-                .equals(
-                name))
-            ? indent[depth]
-            : false;
+                "http://xmlpull.org/v1/doc/features.html#indent-output"
+                        .equals(name)) && indent[depth];
     }
 
     public String getPrefix(String namespace, boolean create) {
@@ -206,7 +202,7 @@ public String getPrefix(String namespace, boolean create) {
         }
     }
 
-    private final String getPrefix(
+    private String getPrefix(
         String namespace,
         boolean includeDefault,
         boolean create)
@@ -216,7 +212,7 @@ private final String getPrefix(
             i >= 0;
             i -= 2) {
             if (nspStack[i + 1].equals(namespace)
-                && (includeDefault || !isEmpty(nspStack[i]))) {
+                && (includeDefault || !TextUtils.isEmpty(nspStack[i]))) {
                 String cand = nspStack[i];
                 for (int j = i + 2;
                     j < nspCounts[depth + 1] * 2;
@@ -236,7 +232,7 @@ private final String getPrefix(
 
         String prefix;
 
-        if (isEmpty(namespace))
+        if (TextUtils.isEmpty(namespace))
             prefix = "";
         else {
             do {
@@ -404,11 +400,11 @@ public XmlSerializer startTag(String namespace, String name)
                 ? ""
                 : getPrefix(namespace, true, true);
 
-        if (namespace != null && isEmpty(namespace)) {
+        if (namespace != null && TextUtils.isEmpty(namespace)) {
             for (int i = nspCounts[depth];
                 i < nspCounts[depth + 1];
                 i++) {
-                if (isEmpty(nspStack[i * 2]) && !isEmpty(nspStack[i * 2 + 1])) {
+                if (TextUtils.isEmpty(nspStack[i * 2]) && !TextUtils.isEmpty(nspStack[i * 2 + 1])) {
                     throw new IllegalStateException("Cannot set default namespace for elements in no namespace");
                 }
             }
@@ -419,7 +415,7 @@ public XmlSerializer startTag(String namespace, String name)
         elementStack[esp] = name;
 
         writer.write('<');
-        if (!isEmpty(prefix)) {
+        if (!TextUtils.isEmpty(prefix)) {
             writer.write(prefix);
             writer.write(':');
         }
@@ -448,7 +444,7 @@ public XmlSerializer attribute(
         //        pending = false;
 
         String prefix =
-            isEmpty(namespace)
+                TextUtils.isEmpty(namespace)
                 ? ""
                 : getPrefix(namespace, false, true);
 
@@ -469,7 +465,7 @@ public XmlSerializer attribute(
                 */
 
         writer.write(' ');
-        if (!isEmpty(prefix)) {
+        if (!TextUtils.isEmpty(prefix)) {
             writer.write(prefix);
             writer.write(':');
         }
@@ -521,7 +517,7 @@ public XmlSerializer endTag(String namespace, String name)
 
             writer.write("</");
             String prefix = elementStack[depth * 3 + 1];
-            if (!isEmpty(prefix)) {
+            if (!TextUtils.isEmpty(prefix)) {
                 writer.write(prefix);
                 writer.write(':');
             }
@@ -593,8 +589,4 @@ public void processingInstruction(String pi)
         writer.write(pi);
         writer.write("?>");
     }
-
-    private static boolean isEmpty(String s) {
-        return s.length() == 0;
-    }
 }
diff --git a/app/src/org/runnerup/util/SafeParse.java b/app/src/org/runnerup/util/SafeParse.java
index c2094de5d..8af6fb569 100644
--- a/app/src/org/runnerup/util/SafeParse.java
+++ b/app/src/org/runnerup/util/SafeParse.java
@@ -17,10 +17,7 @@
 
 package org.runnerup.util;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
 public class SafeParse {
 
     public static int parseInt(String string, int defaultValue) {
diff --git a/app/src/org/runnerup/util/SimpleCursorLoader.java b/app/src/org/runnerup/util/SimpleCursorLoader.java
index 288b6461e..973d9d5de 100644
--- a/app/src/org/runnerup/util/SimpleCursorLoader.java
+++ b/app/src/org/runnerup/util/SimpleCursorLoader.java
@@ -17,13 +17,11 @@
 
 package org.runnerup.util;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class SimpleCursorLoader extends android.support.v4.content.CursorLoader {
 
     private final SQLiteDatabase mDB;
diff --git a/app/src/org/runnerup/util/TickListener.java b/app/src/org/runnerup/util/TickListener.java
index 9635cd2eb..662c6026f 100644
--- a/app/src/org/runnerup/util/TickListener.java
+++ b/app/src/org/runnerup/util/TickListener.java
@@ -19,5 +19,5 @@
 
 public interface TickListener {
 
-    public void onTick();
+    void onTick();
 }
diff --git a/app/src/org/runnerup/view/AccountActivity.java b/app/src/org/runnerup/view/AccountActivity.java
index 5b1843938..b9059a845 100644
--- a/app/src/org/runnerup/view/AccountActivity.java
+++ b/app/src/org/runnerup/view/AccountActivity.java
@@ -17,7 +17,6 @@
 
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.app.AlertDialog;
 import android.content.ContentValues;
 import android.content.DialogInterface;
@@ -60,7 +59,7 @@
 
 import java.util.ArrayList;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class AccountActivity extends AppCompatActivity implements Constants {
     private long synchronizerID = -1;
     private String synchronizer = null;
@@ -129,7 +128,7 @@ public void onDestroy() {
         syncManager.close();
     }
 
-    void fillData() {
+    private void fillData() {
         // Fields from the database (projection)
         // Must include the _id column for the adapter to work
         String[] from = new String[]{
@@ -228,7 +227,7 @@ void fillData() {
         mCursors.add(c);
     }
 
-    void addRow(String string, View btn) {
+    private void addRow(String string, View btn) {
         TableLayout table = (TableLayout) findViewById(R.id.account_table);
         TableRow row = new TableRow(this);
         TextView title = new TextView(this);
diff --git a/app/src/org/runnerup/view/AccountListActivity.java b/app/src/org/runnerup/view/AccountListActivity.java
index cf69362f8..73a2bbdf0 100644
--- a/app/src/org/runnerup/view/AccountListActivity.java
+++ b/app/src/org/runnerup/view/AccountListActivity.java
@@ -17,13 +17,11 @@
 
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
 import android.support.v4.content.Loader;
@@ -53,16 +51,15 @@
 import org.runnerup.util.SimpleCursorLoader;
 import org.runnerup.widget.WidgetUtil;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class AccountListActivity extends AppCompatActivity implements Constants,
         LoaderCallbacks<Cursor> {
 
-    SQLiteDatabase mDB = null;
-    SyncManager mSyncManager = null;
-    boolean mTabFormat = false;
+    private SQLiteDatabase mDB = null;
+    private SyncManager mSyncManager = null;
+    private boolean mTabFormat = false;
     private boolean mShowDisabled = false;
-    ListView mListView;
-    CursorAdapter mCursorAdapter;
+    private CursorAdapter mCursorAdapter;
 
     /** Called when the activity is first created. */
 
@@ -74,11 +71,11 @@ public void onCreate(Bundle savedInstanceState) {
 
         mDB = DBHelper.getReadableDatabase(this);
         mSyncManager = new SyncManager(this);
-        mListView = (ListView) findViewById(R.id.account_list);
-        mListView.setDividerHeight(10);
+        ListView listView = (ListView) findViewById(R.id.account_list);
+        listView.setDividerHeight(10);
         mCursorAdapter = new AccountListAdapter(this, null);
-        mListView.setAdapter(mCursorAdapter);
-        mListView.setOnItemLongClickListener(itemLongClickListener);
+        listView.setAdapter(mCursorAdapter);
+        listView.setOnItemLongClickListener(itemLongClickListener);
         getSupportLoaderManager().initLoader(0, null, this);
     }
 
@@ -232,7 +229,7 @@ public View newView(Context context, Cursor cursor, ViewGroup parent) {
         }
     }
 
-    final OnClickListener configureButtonClick = new OnClickListener() {
+    private final OnClickListener configureButtonClick = new OnClickListener() {
         public void onClick(View v) {
             final String synchronizerName = (String) v.getTag();
             if (mSyncManager.isConfigured(synchronizerName)) {
@@ -243,7 +240,7 @@ public void onClick(View v) {
         }
     };
 
-    final AdapterView.OnItemLongClickListener itemLongClickListener = new AdapterView.OnItemLongClickListener() {
+    private final AdapterView.OnItemLongClickListener itemLongClickListener = new AdapterView.OnItemLongClickListener() {
         public boolean onItemLongClick(AdapterView<?> arg0, View v,
                                     int pos, long id) {
             ContentValues tmp = DBHelper.get((Cursor)arg0.getItemAtPosition(pos));
@@ -273,7 +270,7 @@ private void setFlag(Object obj, int flag, boolean val) {
         }
     }
 
-    final SyncManager.Callback callback = new SyncManager.Callback() {
+    private final SyncManager.Callback callback = new SyncManager.Callback() {
         @Override
         public void run(String synchronizerName, Status status) {
             if (status == Synchronizer.Status.OK) {
@@ -282,7 +279,7 @@ public void run(String synchronizerName, Status status) {
         }
     };
 
-    void startActivity(String synchronizer, boolean edit) {
+    private void startActivity(String synchronizer, boolean edit) {
         Intent intent = new Intent(AccountListActivity.this, AccountActivity.class);
         intent.putExtra("synchronizer", synchronizer);
         intent.putExtra("edit", edit);
diff --git a/app/src/org/runnerup/view/AudioCueSettingsActivity.java b/app/src/org/runnerup/view/AudioCueSettingsActivity.java
index 217a44b9e..2585b87ed 100644
--- a/app/src/org/runnerup/view/AudioCueSettingsActivity.java
+++ b/app/src/org/runnerup/view/AudioCueSettingsActivity.java
@@ -17,7 +17,6 @@
 
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.app.AlertDialog;
 import android.content.ContentValues;
 import android.content.Context;
@@ -27,7 +26,6 @@
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
@@ -59,19 +57,19 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class AudioCueSettingsActivity extends PreferenceActivity {
 
-    boolean started = false;
-    boolean delete = false;
-    String settingsName = null;
-    AudioSchemeListAdapter adapter = null;
-    SQLiteDatabase mDB = null;
-    MenuItem newSettings;
+    private boolean started = false;
+    private boolean delete = false;
+    private String settingsName = null;
+    private AudioSchemeListAdapter adapter = null;
+    private SQLiteDatabase mDB = null;
+    private MenuItem newSettings;
 
     private String DEFAULT = "Default";
     public static final String SUFFIX = "_audio_cues";
-    static final String PREFS_DIR = "shared_prefs";
+    private static final String PREFS_DIR = "shared_prefs";
 
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -220,7 +218,7 @@ public void onClick(DialogInterface dialog, int which) {
         return true;
     }
 
-    void createNewAudioScheme(String scheme) {
+    private void createNewAudioScheme(String scheme) {
         ContentValues tmp = new ContentValues();
         tmp.put(DB.AUDIO_SCHEMES.NAME, scheme);
         tmp.put(DB.AUDIO_SCHEMES.SORT_ORDER, 0);
@@ -230,7 +228,7 @@ void createNewAudioScheme(String scheme) {
     private void deleteAudioScheme() {
         delete = true;
         getPreferenceManager().getSharedPreferences().edit().clear().commit();
-        /**
+        /*
          * Can only delete file in "next" activity...cause on destory on this,
          * will save file...
          */
@@ -239,7 +237,7 @@ private void deleteAudioScheme() {
     }
 
     private void deleteAudioSchemeImpl(String name) {
-        /**
+        /*
          * Start by deleting file...then delete from table...so we don't get
          * stray files
          */
@@ -254,14 +252,14 @@ private void deleteAudioSchemeImpl(String name) {
         mDB.delete(DB.AUDIO_SCHEMES.TABLE, DB.AUDIO_SCHEMES.NAME + "= ?", args);
     }
 
-    void updateSortOrder(String name) {
+    private void updateSortOrder(String name) {
         mDB.execSQL("UPDATE " + DB.AUDIO_SCHEMES.TABLE + " set " + DB.AUDIO_SCHEMES.SORT_ORDER +
                 " = (SELECT MAX(" + DB.AUDIO_SCHEMES.SORT_ORDER + ") + 1 FROM "
                 + DB.AUDIO_SCHEMES.TABLE + ") " +
                 " WHERE " + DB.AUDIO_SCHEMES.NAME + " = '" + name + "'");
     }
 
-    final OnSetValueListener onSetValueListener = new OnSetValueListener() {
+    private final OnSetValueListener onSetValueListener = new OnSetValueListener() {
 
         @Override
         public String preSetValue(String newValue)
@@ -290,7 +288,7 @@ public int preSetValue(int newValueId) throws IllegalArgumentException {
 
     private void switchTo(String name) {
 
-        if (started == false) {
+        if (!started) {
             // TODO investigate "spurious" onItemSelected during start
             started = true;
             return;
@@ -338,7 +336,7 @@ public void onClick(DialogInterface dialog, int which) {
         dialog.show();
     }
 
-    final OnPreferenceClickListener onSilenceClick = new OnPreferenceClickListener() {
+    private final OnPreferenceClickListener onSilenceClick = new OnPreferenceClickListener() {
         @Override
         public boolean onPreferenceClick(Preference preference) {
             Resources res = getResources();
@@ -378,16 +376,16 @@ public boolean onPreferenceClick(Preference preference) {
 
     };
 
-    final OnPreferenceClickListener onTestCueinfoClick = new OnPreferenceClickListener() {
+    private final OnPreferenceClickListener onTestCueinfoClick = new OnPreferenceClickListener() {
 
         TextToSpeech tts = null;
-        final ArrayList<Feedback> feedback = new ArrayList<Feedback>();
+        final ArrayList<Feedback> feedback = new ArrayList<>();
 
         private final OnInitListener mTTSOnInitListener = new OnInitListener() {
 
             @Override
             public void onInit(int arg0) {
-                SharedPreferences prefs = null;
+                SharedPreferences prefs;
                 if (settingsName == null || settingsName.contentEquals(DEFAULT))
                     prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
                 else
@@ -398,7 +396,7 @@ public void onInit(int arg0) {
 
                 Workout w = Workout.fakeWorkoutForTestingAudioCue();
                 RUTextToSpeech rutts = new RUTextToSpeech(tts, mute, getApplicationContext());
-                HashMap<String, Object> bindValues = new HashMap<String, Object>();
+                HashMap<String, Object> bindValues = new HashMap<>();
                 bindValues.put(Workout.KEY_TTS, rutts);
                 bindValues.put(Workout.KEY_FORMATTER, new Formatter(AudioCueSettingsActivity.this));
                 bindValues.put(Workout.KEY_HRZONES, new HRZones(AudioCueSettingsActivity.this));
@@ -418,7 +416,7 @@ public boolean onPreferenceClick(Preference arg0) {
             Resources res = getResources();
 
             feedback.clear();
-            SharedPreferences prefs = null;
+            SharedPreferences prefs;
             if (settingsName == null || settingsName.contentEquals(DEFAULT))
                 prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
             else
diff --git a/app/src/org/runnerup/view/AudioSchemeListAdapter.java b/app/src/org/runnerup/view/AudioSchemeListAdapter.java
index 509780b43..af078a605 100644
--- a/app/src/org/runnerup/view/AudioSchemeListAdapter.java
+++ b/app/src/org/runnerup/view/AudioSchemeListAdapter.java
@@ -17,10 +17,8 @@
 
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -32,16 +30,16 @@
 
 import java.util.ArrayList;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 class AudioSchemeListAdapter extends BaseAdapter {
 
     /**
 	 * 
 	 */
-    LayoutInflater inflater = null;
-    SQLiteDatabase mDB = null;
-    boolean createNewItem = true;
-    final ArrayList<String> audioSchemes = new ArrayList<String>();
+    private LayoutInflater inflater = null;
+    private SQLiteDatabase mDB = null;
+    private boolean createNewItem = true;
+    private final ArrayList<String> audioSchemes = new ArrayList<>();
 
     public AudioSchemeListAdapter(SQLiteDatabase db, LayoutInflater inflater, boolean createNew) {
         super();
@@ -53,7 +51,7 @@ public AudioSchemeListAdapter(SQLiteDatabase db, LayoutInflater inflater, boolea
     @Override
     public int getCount() {
         return audioSchemes.size() +
-                /** default */
+                /* default */
                 1 +
                 (createNewItem ? 1 : 0);
     }
diff --git a/app/src/org/runnerup/view/CreateAdvancedWorkout.java b/app/src/org/runnerup/view/CreateAdvancedWorkout.java
index 755baa415..abe4bb328 100644
--- a/app/src/org/runnerup/view/CreateAdvancedWorkout.java
+++ b/app/src/org/runnerup/view/CreateAdvancedWorkout.java
@@ -1,12 +1,10 @@
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -29,18 +27,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class CreateAdvancedWorkout extends Activity {
 
-    Workout advancedWorkout = null;
-    TitleSpinner advancedWorkoutSpinner = null;
-    Button addStepButton = null;
-    Button addRepeatButton = null;
-    Button saveWorkoutButton = null;
-    Button discardWorkoutButton = null;
-    ListView advancedStepList = null;
-    final WorkoutStepsAdapter advancedWorkoutStepsAdapter = new WorkoutStepsAdapter();
-    boolean dontAskAgain = false;
+    private Workout advancedWorkout = null;
+    private TitleSpinner advancedWorkoutSpinner = null;
+    private final WorkoutStepsAdapter advancedWorkoutStepsAdapter = new WorkoutStepsAdapter();
+    private boolean dontAskAgain = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -57,20 +50,20 @@ protected void onCreate(Bundle savedInstanceState) {
 
         dontAskAgain = false;
 
-        advancedStepList = (ListView) findViewById(R.id.new_advnced_workout_steps);
+        ListView advancedStepList = (ListView) findViewById(R.id.new_advnced_workout_steps);
         advancedStepList.setDividerHeight(0);
         advancedStepList.setAdapter(advancedWorkoutStepsAdapter);
 
-        addStepButton = (Button) findViewById(R.id.add_step_button);
+        Button addStepButton = (Button) findViewById(R.id.add_step_button);
         addStepButton.setOnClickListener(addStepButtonClick);
 
-        addRepeatButton = (Button) findViewById(R.id.add_repeat_button);
+        Button addRepeatButton = (Button) findViewById(R.id.add_repeat_button);
         addRepeatButton.setOnClickListener(addRepeatStepButtonClick);
 
-        saveWorkoutButton = (Button) findViewById(R.id.workout_save_button);
+        Button saveWorkoutButton = (Button) findViewById(R.id.workout_save_button);
         saveWorkoutButton.setOnClickListener(saveWorkoutButtonClick);
 
-        discardWorkoutButton = (Button) findViewById(R.id.workout_discard_button);
+        Button discardWorkoutButton = (Button) findViewById(R.id.workout_discard_button);
         discardWorkoutButton.setOnClickListener(discardWorkoutButtonClick);
 
         try {
@@ -87,10 +80,10 @@ private void createAdvancedWorkout(String name) throws JSONException, IOExceptio
         advancedWorkoutStepsAdapter.notifyDataSetChanged();
     }
 
-    @TargetApi(Build.VERSION_CODES.FROYO)
+    
     final class WorkoutStepsAdapter extends BaseAdapter {
 
-        List<Workout.StepListEntry> steps = new ArrayList<Workout.StepListEntry>();
+        List<Workout.StepListEntry> steps = new ArrayList<>();
 
         @Override
         public int getCount() {
@@ -147,7 +140,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
     }
 
 
-    final View.OnClickListener onAddButtonClick = new View.OnClickListener() {
+    private final View.OnClickListener onAddButtonClick = new View.OnClickListener() {
 
         @Override
         public void onClick(View view) {
@@ -179,7 +172,7 @@ public void onClick(View view) {
     };
 
 
-    final View.OnClickListener onDeleteButtonClick = new View.OnClickListener() {
+    private final View.OnClickListener onDeleteButtonClick = new View.OnClickListener() {
 
         @Override
         public void onClick(View view) {
@@ -204,14 +197,12 @@ public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked
                             public void onClick(DialogInterface dialog, int which) {
                                 dialog.dismiss();
                                 deleteStep(stepButton);
-                                return;
                             }
                         });
                 builder.setNegativeButton(getString(R.string.No),
                         new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {
                                 dialog.dismiss();
-                                return;
                             }
                         });
                 builder.show();
@@ -242,7 +233,7 @@ private void deleteStep(StepButton button) {
         }
     };
 
-    final Runnable onWorkoutChanged = new Runnable() {
+    private final Runnable onWorkoutChanged = new Runnable() {
         @Override
         public void run() {
             String advWorkoutName = advancedWorkoutSpinner.getValue().toString();
@@ -261,13 +252,12 @@ public void onClick(DialogInterface dialog, int which) {
                                 }
                             });
                     builder.show();
-                    return;
                 }
             }
         }
     };
 
-    final View.OnClickListener addStepButtonClick = new View.OnClickListener() {
+    private final View.OnClickListener addStepButtonClick = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
             advancedWorkout.addStep(new Step());
@@ -276,7 +266,7 @@ public void onClick(View v) {
         }
     };
 
-    final View.OnClickListener addRepeatStepButtonClick = new View.OnClickListener() {
+    private final View.OnClickListener addRepeatStepButtonClick = new View.OnClickListener() {
         @Override
         public void onClick(View view) {
             advancedWorkout.addStep(new RepeatStep());
@@ -285,7 +275,7 @@ public void onClick(View view) {
         }
     };
 
-    final View.OnClickListener saveWorkoutButtonClick = new View.OnClickListener() {
+    private final View.OnClickListener saveWorkoutButtonClick = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
             try {
@@ -309,10 +299,9 @@ public void onClick(DialogInterface dialog, int which) {
                     }
                 });
         builder.show();
-        return;
     }
 
-    final View.OnClickListener discardWorkoutButtonClick = new View.OnClickListener() {
+    private final View.OnClickListener discardWorkoutButtonClick = new View.OnClickListener() {
         @Override
         public void onClick(View view) {
             final AlertDialog.Builder builder = new AlertDialog.Builder(CreateAdvancedWorkout.this);
@@ -327,18 +316,15 @@ public void onClick(DialogInterface dialog, int which) {
                             //noinspection ResultOfMethodCallIgnored
                             f.delete();
                             finish();
-                            return;
                         }
                     });
             builder.setNegativeButton(getString(R.string.No),
                     new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int which) {
                             dialog.dismiss();
-                            return;
                         }
                     });
             builder.show();
-            return;
         }
     };
 }
diff --git a/app/src/org/runnerup/view/DetailActivity.java b/app/src/org/runnerup/view/DetailActivity.java
index 91a117274..187132a4b 100644
--- a/app/src/org/runnerup/view/DetailActivity.java
+++ b/app/src/org/runnerup/view/DetailActivity.java
@@ -18,7 +18,6 @@
 package org.runnerup.view;
 
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ContentValues;
@@ -31,7 +30,6 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -78,7 +76,7 @@
 import static org.runnerup.content.ActivityProvider.GPX_MIME;
 import static org.runnerup.content.ActivityProvider.TCX_MIME;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class DetailActivity extends AppCompatActivity implements Constants {
 
     private long mID = 0;
@@ -117,6 +115,7 @@ public class DetailActivity extends AppCompatActivity implements Constants {
     /**
      * Called when the activity is first created.
      */
+    @SuppressLint("ObsoleteSdkInt")
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -315,7 +314,7 @@ public void onDestroy() {
 
     private void requery() {
         {
-            /**
+            /*
              * Laps
              */
             String[] from = new String[]{
@@ -339,7 +338,7 @@ private void requery() {
         }
 
         {
-            /**
+            /*
              * Accounts/reports
              */
             String sql = "SELECT DISTINCT "
@@ -506,7 +505,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 case RECOVERY:
                 case WARMUP:
                 case REPEAT:
-                    viewHolder.tv0.setText("(" + getResources().getString(intensity.getTextId()) + ")");
+                    viewHolder.tv0.setText(String.format(Locale.getDefault(), "(%s)",
+                            getResources().getString(intensity.getTextId())));
                 default:
                     break;
 
@@ -527,7 +527,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
                     .getAsInteger(DB.LAP.AVG_HR) : 0;
             if (hr > 0) {
                 viewHolder.tvHr.setVisibility(View.VISIBLE);
-                viewHolder.tvHr.setText(formatter.formatHeartRate(Formatter.Format.TXT_LONG, hr) + " bpm");
+                // Use CUE_LONG instead of TXT_LONG to include unit
+                viewHolder.tvHr.setText(formatter.formatHeartRate(Formatter.Format.CUE_LONG, hr));
             } else if (lapHrPresent) {
                 viewHolder.tvHr.setVisibility(View.INVISIBLE);
             } else {
@@ -748,7 +749,7 @@ public void onClick(DialogInterface dialog, int which) {
     @Override
     public void onBackPressed() {
         if (uploading) {
-            /**
+            /*
              * Ignore while uploading
              */
             return;
diff --git a/app/src/org/runnerup/view/FeedActivity.java b/app/src/org/runnerup/view/FeedActivity.java
index 591ad66ed..35d0ee935 100644
--- a/app/src/org/runnerup/view/FeedActivity.java
+++ b/app/src/org/runnerup/view/FeedActivity.java
@@ -17,14 +17,12 @@
 
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -51,27 +49,27 @@
 
 import java.text.DateFormat;
 import java.util.List;
+import java.util.Locale;
 import java.util.Observable;
 import java.util.Observer;
 import java.util.Set;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class FeedActivity extends Activity implements Constants {
 
-    SQLiteDatabase mDB = null;
-    SyncManager syncManager = null;
-    Formatter formatter = null;
+    private SQLiteDatabase mDB = null;
+    private SyncManager syncManager = null;
+    private Formatter formatter = null;
 
-    FeedList feed = null;
-    ListView feedList = null;
-    FeedListAdapter feedAdapter = null;
+    private FeedList feed = null;
+    private FeedListAdapter feedAdapter = null;
 
-    Button refreshButton = null;
-    LinearLayout feedHeader = null;
-    TextView feedStatus = null;
+    private Button refreshButton = null;
+    private LinearLayout feedHeader = null;
+    private TextView feedStatus = null;
     ProgressBar feedProgressBar = null;
 
-    Button feedAccountButton = null;
+    private Button feedAccountButton = null;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -85,7 +83,7 @@ public void onCreate(Bundle savedInstanceState) {
         feed.load(); // load from DB
 
         feedAdapter = new FeedListAdapter(this, feed);
-        feedList = (ListView) findViewById(R.id.feed_list);
+        ListView feedList = (ListView) findViewById(R.id.feed_list);
         feedList.setAdapter(feedAdapter);
         feedList.setDividerHeight(2);
 
@@ -116,7 +114,7 @@ public void onClick(View v) {
         startSync();
     }
 
-    void startSync() {
+    private void startSync() {
         syncManager.clear();
         Set<String> set = syncManager.feedSynchronizersSet(this);
         if (!set.isEmpty()) {
@@ -133,7 +131,7 @@ void startSync() {
         }
     }
 
-    final Callback syncDone = new Callback() {
+    private final Callback syncDone = new Callback() {
         @Override
         public void run(String synchronizerName, Status status) {
             refreshButton.setEnabled(true);
@@ -141,11 +139,6 @@ public void run(String synchronizerName, Status status) {
         }
     };
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-    }
-
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -236,7 +229,7 @@ public void run(String url, Bitmap b) {
                 String name = formatter.formatName(tmp.getAsString(DB.FEED.USER_FIRST_NAME),
                         tmp.getAsString(DB.FEED.USER_LAST_NAME));
                 String sport = FeedActivity.GetSportActivity(tmp);
-                tv1.setText(name + " trained " + sport);
+                tv1.setText(String.format("%s trained %s", name, sport));//TODO string to translate
                 if (tmp.containsKey(DB.FEED.DISTANCE) || tmp.containsKey(DB.FEED.DURATION)) {
                     double distance = 0;
                     long duration = 0;
@@ -303,7 +296,7 @@ public void update(Observable observable, Object data) {
                 feedAdapter.notifyDataSetChanged();
             } else {
                 String synchronizerName = (String) data;
-                feedStatus.setText(getString(R.string.Synchronizing) + " " + synchronizerName);
+                feedStatus.setText(String.format(Locale.getDefault(), "%s %s", getString(R.string.Synchronizing), synchronizerName)); //TODO parameter
             }
         }
     }
diff --git a/app/src/org/runnerup/view/HRSettingsActivity.java b/app/src/org/runnerup/view/HRSettingsActivity.java
index f02b1da88..274c7f354 100644
--- a/app/src/org/runnerup/view/HRSettingsActivity.java
+++ b/app/src/org/runnerup/view/HRSettingsActivity.java
@@ -17,7 +17,7 @@
 
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
+import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -25,7 +25,6 @@
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.res.Resources;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
@@ -64,43 +63,43 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class HRSettingsActivity extends AppCompatActivity implements HRClient {
 
     private final Handler handler = new Handler();
     private final StringBuffer logBuffer = new StringBuffer();
 
-    List<HRProvider> providers = null;
-    String btName;
-    String btAddress;
-    String btProviderName;
-    HRProvider hrProvider = null;
-
-    Button connectButton = null;
-    Button scanButton = null;
-    TextView tvBTName = null;
-    TextView tvHR = null;
-    TextView tvLog = null;
-    TextView tvBatteryLevel = null;
-
-    Formatter formatter = null;
-    GraphView graphView = null;
-    LineGraphSeries<DataPoint> graphViewSeries = null;
-    final ArrayList<DataPoint> graphViewListData = new ArrayList<>();
-    DataPoint graphViewArrayData[] = new DataPoint[0];
-    static final int GRAPH_HISTORY_SECONDS = 180;
-
-    DeviceAdapter deviceAdapter = null;
-    boolean mIsScanning = false;
-
-    final OnClickListener hrZonesClick = new OnClickListener() {
+    private List<HRProvider> providers = null;
+    private String btName;
+    private String btAddress;
+    private String btProviderName;
+    private HRProvider hrProvider = null;
+
+    private Button connectButton = null;
+    private Button scanButton = null;
+    private TextView tvBTName = null;
+    private TextView tvHR = null;
+    private TextView tvLog = null;
+    private TextView tvBatteryLevel = null;
+
+    private Formatter formatter = null;
+    private GraphView graphView = null;
+    private LineGraphSeries<DataPoint> graphViewSeries = null;
+    private final ArrayList<DataPoint> graphViewListData = new ArrayList<>();
+    private DataPoint[] graphViewArrayData = new DataPoint[0];
+    private static final int GRAPH_HISTORY_SECONDS = 180;
+
+    private DeviceAdapter deviceAdapter = null;
+    private boolean mIsScanning = false;
+
+    private final OnClickListener hrZonesClick = new OnClickListener() {
         @Override
         public void onClick(View arg0) {
             startActivity(new Intent(HRSettingsActivity.this, HRZonesActivity.class));
         }
     };
     
-    final OnClickListener scanButtonClick = new OnClickListener() {
+    private final OnClickListener scanButtonClick = new OnClickListener() {
         public void onClick(View v) {
             clear();
             stopTimer();
@@ -230,11 +229,10 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         }
         if (requestCode == 123) {
             startScan();
-            return;
         }
     }
     
-    int lineNo = 0;
+    private int lineNo = 0;
 
     private void log(String msg) {
         logBuffer.insert(0, Integer.toString(++lineNo) + ": " + msg + "\n");
@@ -244,7 +242,7 @@ private void log(String msg) {
         tvLog.setText(logBuffer.toString());
     }
 
-    void clearHRSettings() {
+    private void clearHRSettings() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(getString(R.string.Clear_HR_settings));
         builder.setMessage(getString(R.string.Are_you_sure));
@@ -283,7 +281,7 @@ private void load() {
 
     private void open() {
         if (hrProvider != null && !hrProvider.isEnabled()) {
-            if (hrProvider.startEnableIntent(this, 0) == true) {
+            if (hrProvider.startEnableIntent(this, 0)) {
                 return;
             }
             hrProvider = null;
@@ -304,7 +302,7 @@ private void close() {
         }
     }
 
-    public void notSupported() {
+    private void notSupported() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(getString(R.string.Heart_rate_monitor_is_not_supported_for_your_device));
         DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {
@@ -315,7 +313,6 @@ public void onClick(DialogInterface dialog, int which) {
         };
         builder.setNegativeButton(getString(R.string.ok_rats), listener);
         builder.show();
-        return;
     }
 
     private void clear() {
@@ -450,7 +447,7 @@ public void onClick(DialogInterface arg0, int arg1) {
         builder.show();
     }
 
-    void connect() {
+    private void connect() {
         stopTimer();
         if (hrProvider == null || btName == null || btAddress == null) {
             updateView();
@@ -500,9 +497,9 @@ private CharSequence getName() {
         return btAddress;
     }
 
-    Timer hrReader = null;
+    private Timer hrReader = null;
 
-    void startTimer() {
+    private void startTimer() {
         hrReader = new Timer();
         hrReader.scheduleAtFixedRate(new TimerTask() {
             @Override
@@ -516,7 +513,7 @@ public void run() {
         }, 0, 500);
     }
 
-    void stopTimer() {
+    private void stopTimer() {
         if (hrReader == null)
             return;
 
@@ -525,10 +522,10 @@ void stopTimer() {
         hrReader = null;
     }
 
-    long lastTimestamp = 0;
-    long timerStartTime = 0;
+    private long lastTimestamp = 0;
+    private long timerStartTime = 0;
 
-    protected void readHR() {
+    private void readHR() {
         if (hrProvider != null) {
             HRData data = hrProvider.getHRData();
             if(data != null) {
@@ -596,10 +593,10 @@ public void onConnectResult(boolean connectOK) {
             save();
             if (hrProvider.getBatteryLevel() > 0) {
                 tvBatteryLevel.setVisibility(View.VISIBLE);
-                tvBatteryLevel.setText(getResources().getText(R.string.Battery_level) + ": " + hrProvider.getBatteryLevel() + "%");
+                tvBatteryLevel.setText(String.format(Locale.getDefault(), "%s: %d%%",
+                        getResources().getText(R.string.Battery_level), hrProvider.getBatteryLevel()));
             }
             startTimer();
-        } else {
         }
         updateView();
     }
@@ -619,15 +616,16 @@ public void log(HRProvider src, String msg) {
         log(src.getProviderName() + ": " + msg);
     }
 
+    @SuppressLint("InflateParams")
     class DeviceAdapter extends BaseAdapter {
 
-        final ArrayList<HRDeviceRef> deviceList = new ArrayList<HRDeviceRef>();
+        final ArrayList<HRDeviceRef> deviceList = new ArrayList<>();
         LayoutInflater inflater = null;
-        Resources resources = null;
+        // --Commented out by Inspection (2017-08-11 13:06):Resources resources = null;
 
         DeviceAdapter(Context ctx) {
             inflater = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            resources = ctx.getResources();
+            //resources = ctx.getResources();
         }
 
         @Override
@@ -649,8 +647,8 @@ public long getItemId(int position) {
         public View getView(int position, View convertView, ViewGroup parent) {
             View row;
             if (convertView == null) {
-                row = inflater.inflate(android.R.layout.simple_list_item_single_choice,
-                        null);
+                //Note: Parent is AlertDialog so parent in inflate must be null
+                row = inflater.inflate(android.R.layout.simple_list_item_single_choice, null);
             } else {
                 row = convertView;
             }
diff --git a/app/src/org/runnerup/view/HRZonesActivity.java b/app/src/org/runnerup/view/HRZonesActivity.java
index 4fd6505f8..aedb7e370 100644
--- a/app/src/org/runnerup/view/HRZonesActivity.java
+++ b/app/src/org/runnerup/view/HRZonesActivity.java
@@ -17,11 +17,10 @@
 
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
+import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
@@ -44,27 +43,28 @@
 import org.runnerup.widget.TitleSpinner;
 import org.runnerup.widget.WidgetUtil;
 
+import java.util.Locale;
 import java.util.Vector;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class HRZonesActivity extends AppCompatActivity implements Constants {
 
-    TitleSpinner ageSpinner;
-    TitleSpinner sexSpinner;
-    TitleSpinner maxHRSpinner;
-    HRZones hrZones;
-    HRZoneCalculator hrZoneCalculator;
+    private TitleSpinner ageSpinner;
+    private TitleSpinner sexSpinner;
+    private TitleSpinner maxHRSpinner;
+    private HRZones hrZones;
+    private HRZoneCalculator hrZoneCalculator;
 
-    final Vector<EditText> zones = new Vector<EditText>();
-    boolean skipSave = false;
+    private final Vector<EditText> zones = new Vector<>();
+    private boolean skipSave = false;
 
-    View addZoneRow(LayoutInflater inflator, ViewGroup root, int zone) {
-        TableRow row = (TableRow) inflator.inflate(R.layout.heartratezonerow, null);
+    private View addZoneRow(LayoutInflater inflator, ViewGroup root, int zone) {
+        @SuppressLint("InflateParams") TableRow row = (TableRow) inflator.inflate(R.layout.heartratezonerow, null);
         TextView tv = (TextView) row.findViewById(R.id.zonetext);
         EditText lo = (EditText) row.findViewById(R.id.zonelo);
         EditText hi = (EditText) row.findViewById(R.id.zonehi);
         Pair<Integer, Integer> lim = hrZoneCalculator.getZoneLimits(zone);
-        tv.setText(getString(R.string.Zone) + " " + zone + " " + lim.first + "% - " + lim.second + "%");
+        tv.setText(String.format(Locale.getDefault(), "%s %d %d%% - %d%%", getString(R.string.Zone), zone, lim.first, lim.second));
         lo.setTag("zone" + zone + "lo");
         hi.setTag("zone" + zone + "hi");
         zones.add(lo);
@@ -155,17 +155,17 @@ private void load() {
         for (int zone = 0; zone < zones.size() / 2; zone++) {
             Pair<Integer, Integer> values = hrZones.getHRValues(zone + 1);
             if (values != null) {
-                EditText lo = zones.get(2 * zone + 0);
+                EditText lo = zones.get(2 * zone /*+ 0*/);
                 EditText hi = zones.get(2 * zone + 1);
-                lo.setText(Integer.toString(values.first));
-                hi.setText(Integer.toString(values.second));
+                lo.setText(String.format(Locale.getDefault(), "%d", values.first));
+                hi.setText(String.format(Locale.getDefault(), "%d", values.second));
                 Log.e(getClass().getName(), "loaded " + (zone + 1) + " " + values.first + "-"
                         + values.second);
             }
         }
     }
 
-    protected void recomputeMaxHR() {
+    private void recomputeMaxHR() {
         new Handler().post(new Runnable() {
 
             @Override
@@ -183,7 +183,7 @@ public void run() {
         });
     }
 
-    protected void recomputeZones() {
+    private void recomputeZones() {
         new Handler().post(new Runnable() {
 
             @Override
@@ -193,8 +193,8 @@ public void run() {
                     int maxHR = Integer.parseInt(maxHRSpinner.getValue().toString());
                     for (int i = 0; i < zoneCount; i++) {
                         Pair<Integer, Integer> val = hrZoneCalculator.computeHRZone(i + 1, maxHR);
-                        zones.get(2 * i + 0).setText(Integer.toString(val.first));
-                        zones.get(2 * i + 1).setText(Integer.toString(val.second));
+                        zones.get(2 * i /*+ 0*/).setText(String.format(Locale.getDefault(), "%d", val.first));
+                        zones.get(2 * i + 1).setText(String.format(Locale.getDefault(), "%d", val.second));
                     }
                 } catch (NumberFormatException ex) {
                 }
@@ -202,9 +202,9 @@ public void run() {
         });
     }
 
-    protected void saveHR() {
+    private void saveHR() {
         try {
-            Vector<Integer> vals = new Vector<Integer>();
+            Vector<Integer> vals = new Vector<>();
             System.err.print("saving: ");
             for (int i = 0; i < zones.size(); i += 2) {
                 vals.add(Integer.valueOf(zones.get(i).getText().toString()));
@@ -217,7 +217,7 @@ protected void saveHR() {
         }
     }
 
-    void clearHRSettings() {
+    private void clearHRSettings() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(getString(R.string.Clear_heart_rate_zone_settings));
         builder.setMessage(getString(R.string.Are_you_sure));
diff --git a/app/src/org/runnerup/view/HRZonesBar.java b/app/src/org/runnerup/view/HRZonesBar.java
index 63f239542..36fc6e73e 100644
--- a/app/src/org/runnerup/view/HRZonesBar.java
+++ b/app/src/org/runnerup/view/HRZonesBar.java
@@ -17,41 +17,39 @@
 
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.os.Build;
 import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 
 import org.runnerup.R;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class HRZonesBar extends View {
 
-    static final int colorLow = Color.WHITE; // Color for the zone 0
-    static final int colorHigh = Color.parseColor("#ff0000"); // Color for the last zone
+    private static final int colorLow = Color.WHITE; // Color for the zone 0
+    private static final int colorHigh = Color.parseColor("#ff0000"); // Color for the last zone
 
     // The two arrays will be used to make the gradient
-    static final int[] dColorLow = new int[]{Color.red(colorLow), Color.green(colorLow), Color.blue(colorLow)};
-    static final int[] dColorDiff = new int[]{Color.red(colorHigh) - dColorLow[0],
+    private static final int[] dColorLow = new int[]{Color.red(colorLow), Color.green(colorLow), Color.blue(colorLow)};
+    private static final int[] dColorDiff = new int[]{Color.red(colorHigh) - dColorLow[0],
             Color.green(colorHigh) - dColorLow[1],
             Color.blue(colorHigh) - dColorLow[2]};
 
-    static final float borderSize = 10; // Border around the chart
-    static final float separatorSize = 2; // Separator between two zones
-    static final int minBarHeight = 15;
-    static final int maxBarHeight = 40;
-    static final double chartSize = 0.8;
+    private static final float borderSize = 10; // Border around the chart
+    private static final float separatorSize = 2; // Separator between two zones
+    private static final int minBarHeight = 15;
+    private static final int maxBarHeight = 40;
+    private static final double chartSize = 0.8;
 
-    final Paint paint = new Paint();
-    final Paint fontPaint = new Paint();
+    private final Paint paint = new Paint();
+    private final Paint fontPaint = new Paint();
 
-    double[] hrzData = null;
+    private double[] hrzData = null;
 
     public HRZonesBar (Context ctx) {
         super(ctx);
diff --git a/app/src/org/runnerup/view/HRZonesListAdapter.java b/app/src/org/runnerup/view/HRZonesListAdapter.java
index 343255ea5..54753e56e 100644
--- a/app/src/org/runnerup/view/HRZonesListAdapter.java
+++ b/app/src/org/runnerup/view/HRZonesListAdapter.java
@@ -17,9 +17,7 @@
 
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -29,14 +27,14 @@
 
 import org.runnerup.util.HRZones;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
-public class HRZonesListAdapter extends BaseAdapter {
+
+class HRZonesListAdapter extends BaseAdapter {
 
     /**
 	 * 
 	 */
     HRZones hrZones = null;
-    LayoutInflater inflater = null;
+    private LayoutInflater inflater = null;
 
     public HRZonesListAdapter(Context ctx, LayoutInflater inflater) {
         super();
@@ -49,8 +47,8 @@ public int getCount() {
         return hrZones.getCount();
     }
 
-    String lastString = null;
-    int lastPosition = -1;
+    private String lastString = null;
+    private int lastPosition = -1;
 
     @Override
     public Object getItem(int position) {
diff --git a/app/src/org/runnerup/view/HistoryActivity.java b/app/src/org/runnerup/view/HistoryActivity.java
index 56110abf2..95ba079c8 100644
--- a/app/src/org/runnerup/view/HistoryActivity.java
+++ b/app/src/org/runnerup/view/HistoryActivity.java
@@ -17,12 +17,10 @@
 
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
@@ -45,15 +43,16 @@
 import org.runnerup.util.SimpleCursorLoader;
 import org.runnerup.workout.Sport;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+import java.util.Locale;
+
+
 public class HistoryActivity extends FragmentActivity implements Constants, OnItemClickListener,
         LoaderCallbacks<Cursor> {
 
-    SQLiteDatabase mDB = null;
-    Formatter formatter = null;
+    private SQLiteDatabase mDB = null;
+    private Formatter formatter = null;
 
-    ListView listView = null;
-    CursorAdapter cursorAdapter = null;
+    private CursorAdapter cursorAdapter = null;
 
     /** Called when the activity is first created. */
 
@@ -61,7 +60,7 @@ public class HistoryActivity extends FragmentActivity implements Constants, OnIt
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.history);
-        listView = (ListView) findViewById(R.id.history_list);
+        ListView listView = (ListView) findViewById(R.id.history_list);
 
         mDB = DBHelper.getReadableDatabase(this);
         formatter = new Formatter(this);
@@ -147,7 +146,7 @@ public void bindView(View view, Context context, Cursor cursor) {
 
             {
                 TextView tv = (TextView) view.findViewById(to[0]);
-                tv.setText(Long.toString(id));
+                tv.setText(String.format(Locale.getDefault(), "%d", id));
             }
 
             {
diff --git a/app/src/org/runnerup/view/MainLayout.java b/app/src/org/runnerup/view/MainLayout.java
index b2cbe63aa..db56777cb 100644
--- a/app/src/org/runnerup/view/MainLayout.java
+++ b/app/src/org/runnerup/view/MainLayout.java
@@ -18,7 +18,7 @@
 package org.runnerup.view;
 
 import android.Manifest;
-import android.annotation.TargetApi;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Service;
@@ -36,10 +36,8 @@
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
@@ -69,13 +67,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class MainLayout extends TabActivity
         implements ActivityCompat.OnRequestPermissionsResultCallback {
 
     private Drawable myGetDrawable(int resId) {
-        Drawable d = getResources().getDrawable(resId);
-        return d;
+        return getResources().getDrawable(resId);
     }
 
     private enum UpgradeState {
@@ -171,7 +168,7 @@ public void onCreate(Bundle savedInstanceState) {
         final Uri data = getIntent().getData();
         if (data != null) {
             if (SettingsActivity.requestReadStoragePermissions(MainLayout.this)) {
-                String filePath = null;
+                String filePath;
                 if ("content".equals(data.getScheme())) {
                     Cursor cursor = this.getContentResolver().query(data, new String[]{android.provider.MediaStore.Images.ImageColumns.DATA}, null, null, null);
                     cursor.moveToFirst();
@@ -189,7 +186,7 @@ public void onCreate(Bundle savedInstanceState) {
         }
     }
 
-    void handleBundled(AssetManager mgr, String srcBase, String dstBase) {
+    private void handleBundled(AssetManager mgr, String srcBase, String dstBase) {
         String list[] = null;
 
         try {
@@ -216,6 +213,7 @@ void handleBundled(AssetManager mgr, String srcBase, String dstBase) {
                 if (!isFile) {
                     //The request is hierarchical, source is still on a directory level
                     File dstDir = new File(dstBase);
+                    //noinspection ResultOfMethodCallIgnored
                     dstDir.mkdir();
                     if (!dstDir.isDirectory()) {
                         Log.w(getClass().getName(), "Failed to copy " + src + " as \"" + dstBase
@@ -274,7 +272,7 @@ private void handleHooks(String key) {
         }
     }
 
-    public final OnClickListener onRateClick = new OnClickListener() {
+    private final OnClickListener onRateClick = new OnClickListener() {
         @Override
         public void onClick(View arg0) {
             try {
@@ -286,10 +284,10 @@ public void onClick(View arg0) {
         }
     };
 
-    public void whatsNew() {
+    private void whatsNew() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         LayoutInflater inflater = (LayoutInflater) getSystemService(Service.LAYOUT_INFLATER_SERVICE);
-        View view = inflater.inflate(R.layout.whatsnew, null);
+        @SuppressLint("InflateParams") View view = inflater.inflate(R.layout.whatsnew, null);
         WebView wv = (WebView) view.findViewById(R.id.web_view1);
         builder.setTitle(getString(R.string.Whats_new));
         builder.setView(view);
@@ -310,7 +308,7 @@ public void onClick(DialogInterface dialog, int which) {
         wv.loadUrl("file:///android_asset/changes.html");
     }
 
-    public static void requestGpsPermissions(final Activity activity, final View view) {
+    private static void requestGpsPermissions(final Activity activity, final View view) {
         String[] requiredPerms = new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION};
         List<String> defaultPerms = new ArrayList<>();
         List<String> shouldPerms = new ArrayList<>();
diff --git a/app/src/org/runnerup/view/ManageWorkoutsActivity.java b/app/src/org/runnerup/view/ManageWorkoutsActivity.java
index 02ffb5ea3..7cf0d1131 100644
--- a/app/src/org/runnerup/view/ManageWorkoutsActivity.java
+++ b/app/src/org/runnerup/view/ManageWorkoutsActivity.java
@@ -17,7 +17,6 @@
 
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ContentResolver;
@@ -30,7 +29,6 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
@@ -77,30 +75,29 @@
 import java.util.HashSet;
 import java.util.List;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class ManageWorkoutsActivity extends Activity implements Constants {
 
-    SQLiteDatabase mDB = null;
+    private SQLiteDatabase mDB = null;
 
     private String PHONE_STRING = "my phone";
     public final static String WORKOUT_NAME = "";
 
-    final HashSet<SyncManager.WorkoutRef> pendingWorkouts = new HashSet<SyncManager.WorkoutRef>();
-    final ArrayList<ContentValues> providers = new ArrayList<ContentValues>();
-    final HashMap<String, ArrayList<SyncManager.WorkoutRef>> workouts = new HashMap<String, ArrayList<SyncManager.WorkoutRef>>();
-    WorkoutAccountListAdapter adapter = null;
+    private final HashSet<SyncManager.WorkoutRef> pendingWorkouts = new HashSet<>();
+    private final ArrayList<ContentValues> providers = new ArrayList<>();
+    private final HashMap<String, ArrayList<SyncManager.WorkoutRef>> workouts = new HashMap<>();
+    private WorkoutAccountListAdapter adapter = null;
 
-    final HashSet<String> loadedProviders = new HashSet<String>();
+    private final HashSet<String> loadedProviders = new HashSet<>();
 
-    boolean uploading = false;
-    ExpandableListView list = null;
-    CompoundButton currentlySelectedWorkout = null;
-    Button downloadButton = null;
-    Button deleteButton = null;
-    Button shareButton = null;
-    Button createButton = null;
+    private boolean uploading = false;
+    private CompoundButton currentlySelectedWorkout = null;
+    private Button downloadButton = null;
+    private Button deleteButton = null;
+    private Button shareButton = null;
+    private Button createButton = null;
 
-    SyncManager syncManager = null;
+    private SyncManager syncManager = null;
 
     /** Called when the activity is first created. */
     @Override
@@ -113,7 +110,7 @@ public void onCreate(Bundle savedInstanceState) {
         mDB = DBHelper.getReadableDatabase(this);
         syncManager = new SyncManager(this);
         adapter = new WorkoutAccountListAdapter(this);
-        list = (ExpandableListView) findViewById(R.id.expandable_list_view);
+        ExpandableListView list = (ExpandableListView) findViewById(R.id.expandable_list_view);
         list.setAdapter(adapter);
         downloadButton = (Button) findViewById(R.id.download_workout_button);
         downloadButton.setOnClickListener(downloadButtonClick);
@@ -148,13 +145,10 @@ public void onCreate(Bundle savedInstanceState) {
                             public void onClick(DialogInterface dialog, int which) {
                                 dialog.dismiss();
                                 ManageWorkoutsActivity.this.finish();
-                                return;
                             }
                         });
                 builder.show();
-                return;
             }
-            return;
         }
         // launch home Activity (with FLAG_ACTIVITY_CLEAR_TOP)
     }
@@ -186,7 +180,7 @@ private void importData(final String fileName, final Uri data) throws Exception
         if (is == null) {
             throw new Exception("Failed to get input stream");
         }
-        boolean convertRestToRecovery = true; // we just test to import, value of this doesnt matter
+        final boolean convertRestToRecovery = true; // we just test to import, value of this doesnt matter
         Workout w = WorkoutSerializer.readJSON(new BufferedReader(new InputStreamReader(is)),
                 convertRestToRecovery);
         is.close();
@@ -206,7 +200,7 @@ public void onClick(DialogInterface dialog, int which) {
                         dialog.dismiss();
                         String saveName = fileName;
                         try {
-                            if (exists && selected[0] == false) {
+                            if (exists && !selected[0]) {
                                 String name = "";
                                 String tmp[] = fileName.split("\\.");
                                 if (tmp.length > 0) {
@@ -234,7 +228,6 @@ public void onClick(DialogInterface dialog, int which) {
                             e.printStackTrace();
                         }
                         launchMain(saveName);
-                        return;
                     }
                 });
         builder.setNegativeButton(getString(R.string.No_way),
@@ -243,7 +236,6 @@ public void onClick(DialogInterface dialog, int which) {
                         // Do nothing but close the dialog
                         dialog.dismiss();
                         finish();
-                        return;
                     }
                 });
 
@@ -262,7 +254,6 @@ public void onClick(DialogInterface arg0, int arg1,
         }
 
         builder.show();
-        return;
     }
 
     private void saveImport(String file, InputStream is) throws IOException {
@@ -277,7 +268,7 @@ private void saveImport(String file, InputStream is) throws IOException {
         out.close();
     }
 
-    protected void launchMain(String fileName) {
+    private void launchMain(String fileName) {
         SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
         pref.edit().putString(getResources().getString(R.string.pref_advanced_workout), fileName).commit();
 
@@ -286,7 +277,6 @@ protected void launchMain(String fileName) {
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         startActivity(intent);
         finish();
-        return;
     }
 
     @Override
@@ -318,8 +308,8 @@ private void handleButtons() {
         }
     }
 
-    void listLocal() {
-        ArrayList<SyncManager.WorkoutRef> newlist = new ArrayList<SyncManager.WorkoutRef>();
+    private void listLocal() {
+        ArrayList<SyncManager.WorkoutRef> newlist = new ArrayList<>();
         String[] list = org.runnerup.view.WorkoutListAdapter.load(this);
         if (list != null) {
             for (String s : list) {
@@ -341,10 +331,10 @@ public void onDestroy() {
         syncManager.close();
     }
 
-    void requery() {
-        ContentValues allSynchronizers[] = null;
+    private void requery() {
+        ContentValues allSynchronizers[];
         {
-            /**
+            /*
              * Accounts/reports
              */
             String sql = "SELECT DISTINCT "
@@ -383,8 +373,8 @@ void requery() {
 
     @Override
     public void onBackPressed() {
-        if (uploading == true) {
-            /**
+        if (uploading) {
+            /*
              * Ignore while uploading
              */
             return;
@@ -398,12 +388,12 @@ interface Filter<T> {
 
     ArrayList<SyncManager.WorkoutRef> filter(List<SyncManager.WorkoutRef> list,
             Filter<SyncManager.WorkoutRef> f) {
-        ArrayList<SyncManager.WorkoutRef> newlist = new ArrayList<SyncManager.WorkoutRef>();
+        ArrayList<SyncManager.WorkoutRef> newlist = new ArrayList<>();
         return filter(list, newlist, f);
     }
 
-    ArrayList<SyncManager.WorkoutRef> filter(List<SyncManager.WorkoutRef> list,
-            ArrayList<WorkoutRef> newlist, Filter<SyncManager.WorkoutRef> f) {
+    private ArrayList<SyncManager.WorkoutRef> filter(List<SyncManager.WorkoutRef> list,
+                                                     ArrayList<WorkoutRef> newlist, Filter<SyncManager.WorkoutRef> f) {
         for (SyncManager.WorkoutRef w : list) {
             if (f.match(w))
                 newlist.add(w);
@@ -412,7 +402,7 @@ ArrayList<SyncManager.WorkoutRef> filter(List<SyncManager.WorkoutRef> list,
     }
 
 
-    final OnClickListener createButtonClick = new OnClickListener() {
+    private final OnClickListener createButtonClick = new OnClickListener() {
         @Override
         public void onClick(View view) {
             final Intent intent = new Intent(ManageWorkoutsActivity.this, CreateAdvancedWorkout.class);
@@ -445,7 +435,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
         }
     };
 
-    final OnClickListener downloadButtonClick = new OnClickListener() {
+    private final OnClickListener downloadButtonClick = new OnClickListener() {
 
         @Override
         public void onClick(View v) {
@@ -463,7 +453,6 @@ public void onClick(View v) {
                             public void onClick(DialogInterface dialog, int which) {
                                 dialog.dismiss();
                                 downloadWorkout(selected);
-                                return;
                             }
                         });
                 builder.setNegativeButton(getString(R.string.No),
@@ -483,7 +472,7 @@ public void onClick(DialogInterface dialog, int which) {
 
         private void downloadWorkout(WorkoutRef selected) {
             uploading = true;
-            HashSet<WorkoutRef> list = new HashSet<WorkoutRef>();
+            HashSet<WorkoutRef> list = new HashSet<>();
             list.add((WorkoutRef) currentlySelectedWorkout.getTag());
             syncManager.loadWorkouts(list, new SyncManager.Callback() {
                 @Override
@@ -523,7 +512,6 @@ public void onClick(View v) {
                         public void onClick(DialogInterface dialog, int which) {
                             dialog.dismiss();
                             deleteWorkout(selected);
-                            return;
                         }
                     });
             builder.setNegativeButton(getString(R.string.No),
@@ -535,7 +523,6 @@ public void onClick(DialogInterface dialog, int which) {
 
                     });
             builder.show();
-            return;
         }
     };
 
@@ -551,7 +538,7 @@ private void deleteWorkout(WorkoutRef selected) {
         listLocal();
     }
 
-    public final OnCheckedChangeListener onWorkoutChecked = new OnCheckedChangeListener() {
+    private final OnCheckedChangeListener onWorkoutChecked = new OnCheckedChangeListener() {
         @Override
         public void onCheckedChanged(CompoundButton arg0, boolean isChecked) {
             if (currentlySelectedWorkout != null) {
@@ -676,7 +663,7 @@ public long getGroupId(int groupPosition) {
         @Override
         public View getGroupView(int groupPosition, boolean isExpanded,
                 View convertView, ViewGroup parent) {
-            TextView view = null;
+            TextView view;
             if (convertView != null && convertView instanceof TextView)
                 view = (TextView) convertView;
             else
@@ -737,7 +724,7 @@ public void run(String synchronizerName, Status status) {
                 ArrayList<WorkoutRef> list = workouts.get(synchronizerName);
                 list.clear();
 
-                HashSet<String> tmp = new HashSet<String>();
+                HashSet<String> tmp = new HashSet<>();
                 tmp.add(synchronizerName);
 
                 syncManager.loadWorkoutList(list, onLoadWorkoutListCallback, tmp);
diff --git a/app/src/org/runnerup/view/RunActivity.java b/app/src/org/runnerup/view/RunActivity.java
index 1d0b519b8..fe9758393 100644
--- a/app/src/org/runnerup/view/RunActivity.java
+++ b/app/src/org/runnerup/view/RunActivity.java
@@ -17,8 +17,6 @@
 
 package org.runnerup.view;
 
-import android.Manifest;
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.ContentValues;
@@ -28,7 +26,6 @@
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.location.Location;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -47,7 +44,6 @@
 import org.runnerup.tracker.Tracker;
 import org.runnerup.tracker.component.TrackerHRM;
 import org.runnerup.util.Formatter;
-import org.runnerup.util.HRZones;
 import org.runnerup.util.TickListener;
 import org.runnerup.widget.WidgetUtil;
 import org.runnerup.workout.Intensity;
@@ -58,32 +54,32 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Timer;
 import java.util.TimerTask;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class RunActivity extends Activity implements TickListener {
-    Workout workout = null;
-    Tracker mTracker = null;
-    final Handler handler = new Handler();
-
-    Button pauseButton = null;
-    Button stopButton = null;
-    Button newLapButton = null;
-    TextView activityTime = null;
-    TextView activityDistance = null;
-    TextView activityPace = null;
-    TextView lapTime = null;
-    TextView lapDistance = null;
-    TextView lapPace = null;
-    TextView intervalTime = null;
-    TextView intervalDistance = null;
-    TextView intervalPace = null;
-    TextView countdownView = null;
-    ListView workoutList = null;
-    View tableRowInterval = null;
-    org.runnerup.workout.Step currentStep = null;
-    Formatter formatter = null;
+    private Workout workout = null;
+    private Tracker mTracker = null;
+    private final Handler handler = new Handler();
+
+    private Button pauseButton = null;
+    private Button newLapButton = null;
+    private TextView activityTime = null;
+    private TextView activityDistance = null;
+    private TextView activityPace = null;
+    private TextView lapTime = null;
+    private TextView lapDistance = null;
+    private TextView lapPace = null;
+    private TextView intervalTime = null;
+    private TextView intervalDistance = null;
+    private TextView intervalPace = null;
+    private TextView countdownView = null;
+    private ListView workoutList = null;
+    private View tableRowInterval = null;
+    private org.runnerup.workout.Step currentStep = null;
+    private Formatter formatter = null;
     private TextView activityHr;
     private TextView lapHr;
     private TextView intervalHr;
@@ -95,10 +91,9 @@ class WorkoutRow {
         public int level;
     }
 
-    final ArrayList<WorkoutRow> workoutRows = new ArrayList<WorkoutRow>();
-    final ArrayList<BaseAdapter> adapters = new ArrayList<BaseAdapter>(2);
-    boolean simpleWorkout;
-    HRZones hrZones = null;
+    private final ArrayList<WorkoutRow> workoutRows = new ArrayList<>();
+    //private final ArrayList<BaseAdapter> adapters = new ArrayList<>(2);
+    private boolean simpleWorkout;
 
     /** Called when the activity is first created. */
 
@@ -108,9 +103,9 @@ public void onCreate(Bundle savedInstanceState) {
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         setContentView(R.layout.run);
         formatter = new Formatter(this);
-        hrZones = new HRZones(this);
+        //HRZones hrZones = new HRZones(this);
 
-        stopButton = (Button) findViewById(R.id.stop_button);
+        Button stopButton = (Button) findViewById(R.id.stop_button);
         stopButton.setOnClickListener(stopButtonClick);
         pauseButton = (Button) findViewById(R.id.pause_button);
         pauseButton.setOnClickListener(pauseButtonClick);
@@ -161,7 +156,7 @@ public void onDestroy() {
 
     }
 
-    void onGpsTrackerBound() {
+    private void onGpsTrackerBound() {
         if (mTracker == null) {
             // should not happen
             return;
@@ -175,11 +170,11 @@ void onGpsTrackerBound() {
         workout = mTracker.getWorkout();
 
         {
-            /**
+            /*
              * Countdown view can't be bound until RunActivity is started
              *   since it's not created until then
              */
-            HashMap<String, Object> bindValues = new HashMap<String, Object>();
+            HashMap<String, Object> bindValues = new HashMap<>();
             bindValues.put(Workout.KEY_COUNTER_VIEW, countdownView);
             workout.onBind(workout, bindValues);
         }
@@ -187,12 +182,9 @@ void onGpsTrackerBound() {
         startTimer();
 
         populateWorkoutList();
-        simpleWorkout = false;
-        if (workoutRows.size() == 1 ||
+        simpleWorkout = workoutRows.size() == 1 ||
                 workoutRows.size() == 2
-                && workoutRows.get(0).step.getIntensity() == Intensity.RESTING) {
-            simpleWorkout = true;
-        }
+                        && workoutRows.get(0).step.getIntensity() == Intensity.RESTING;
 
         if (simpleWorkout) {
             newLapButton.setOnClickListener(newLapButtonClick);
@@ -212,14 +204,14 @@ private void populateWorkoutList() {
             row.lap = null;
             workoutRows.add(row);
         }
-        for (BaseAdapter a : adapters) {
-            a.notifyDataSetChanged();
-        }
+        //for (BaseAdapter a : adapters) {
+        //    a.notifyDataSetChanged();
+        //}
     }
 
-    Timer timer = null;
+    private Timer timer = null;
 
-    void startTimer() {
+    private void startTimer() {
         timer = new Timer();
         timer.scheduleAtFixedRate(new TimerTask() {
             @Override
@@ -233,7 +225,7 @@ public void run() {
         }, 0, 500);
     }
 
-    void stopTimer() {
+    private void stopTimer() {
         if (timer != null) {
             timer.cancel();
             timer.purge();
@@ -241,7 +233,7 @@ void stopTimer() {
         }
     }
 
-    Location l = null;
+    private Location l = null;
 
     public void onTick() {
         if (workout != null) {
@@ -257,14 +249,14 @@ public void onTick() {
         }
     }
 
-    final OnClickListener stopButtonClick = new OnClickListener() {
+    private final OnClickListener stopButtonClick = new OnClickListener() {
         public void onClick(View v) {
             if (timer != null) {
                 workout.onStop(workout);
                 stopTimer(); // set timer=null;
                 mTracker.stopForeground(true); // remove notification
                 Intent intent = new Intent(RunActivity.this, DetailActivity.class);
-                /**
+                /*
                  * The same activity is used to show details and to save
                  * activity they show almost the same information
                  */
@@ -277,11 +269,10 @@ public void onClick(View v) {
 
     @Override
     public void onBackPressed() {
-        boolean ignore_back = true; // atleast magnus belives that this is
-                                    // better...
-        if (ignore_back == false) {
-            stopButtonClick.onClick(stopButton);
-        }
+        //boolean ignore_back = true; // atleast magnus belives that this is better...
+        //if (!ignore_back) {
+        //    stopButtonClick.onClick(stopButton);
+        //}
     }
 
     @Override
@@ -292,36 +283,33 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             return;
         }
         if (resultCode == Activity.RESULT_OK) {
-            /**
+            /*
              * they saved
              */
             workout.onComplete(Scope.ACTIVITY, workout);
             workout.onSave();
             mTracker = null;
             finish();
-            return;
         } else if (resultCode == Activity.RESULT_CANCELED) {
-            /**
+            /*
              * they discarded
              */
             workout.onComplete(Scope.ACTIVITY, workout);
             workout.onDiscard();
             mTracker = null;
             finish();
-            return;
         } else if (resultCode == Activity.RESULT_FIRST_USER) {
             startTimer();
             if (requestCode == 0) {
                 workout.onResume(workout);
-            } else {
-                // we were paused before stopButtonClick...don't resume
+                //else: we were paused before stopButtonClick...don't resume
             }
         } else {
             if (BuildConfig.DEBUG) { throw new AssertionError(); }
         }
     }
 
-    final OnClickListener pauseButtonClick = new OnClickListener() {
+    private final OnClickListener pauseButtonClick = new OnClickListener() {
         public void onClick(View v) {
             if (workout.isPaused()) {
                 workout.onResume(workout);
@@ -344,13 +332,13 @@ private void setPauseButtonEnabled(boolean enabled) {
         }
     }
 
-    final OnClickListener newLapButtonClick = new OnClickListener() {
+    private final OnClickListener newLapButtonClick = new OnClickListener() {
         public void onClick(View v) {
             workout.onNewLap();
         }
     };
 
-    final OnClickListener nextStepButtonClick = new OnClickListener() {
+    private final OnClickListener nextStepButtonClick = new OnClickListener() {
         public void onClick(View v) {
             workout.onNextStep();
         }
@@ -446,7 +434,7 @@ public void onServiceDisconnected(ComponentName className) {
         }
     };
 
-    void bindGpsTracker() {
+    private void bindGpsTracker() {
         // Establish a connection with the service. We use an explicit
         // class name because we want a specific service implementation that
         // we know will be running in our own process (and thus won't be
@@ -456,7 +444,7 @@ void bindGpsTracker() {
         mIsBound = true;
     }
 
-    void unbindGpsTracker() {
+    private void unbindGpsTracker() {
         if (mIsBound) {
             // Detach our existing connection.
             getApplicationContext().unbindService(mConnection);
@@ -533,9 +521,9 @@ private View getWorkoutRow(org.runnerup.workout.Step step, int level, View conve
                     targetPace.setText(formatter.format(Formatter.Format.TXT_SHORT, step.getTargetType(),
                             minValue));
                 } else {
-                    targetPace.setText(formatter.format(Formatter.Format.TXT_SHORT, step.getTargetType(),
-                            minValue) + "-" +
-                            formatter.format(Formatter.Format.TXT_SHORT, step.getTargetType(), maxValue));
+                    targetPace.setText(String.format(Locale.getDefault(), "%s-%s",
+                            formatter.format(Formatter.Format.TXT_SHORT, step.getTargetType(), minValue),
+                            formatter.format(Formatter.Format.TXT_SHORT, step.getTargetType(), maxValue)));
                 }
             }
 
@@ -543,8 +531,8 @@ private View getWorkoutRow(org.runnerup.workout.Step step, int level, View conve
                 if (step.getCurrentRepeat() == step.getRepeatCount()) {
                     durationValue.setText(getString(R.string.Finished));
                 } else {
-                    durationValue.setText("" + (step.getCurrentRepeat() + 1) + "/"
-                            + step.getRepeatCount());
+                    durationValue.setText(String.format(Locale.getDefault(), "%d/%d",
+                            (step.getCurrentRepeat() + 1), step.getRepeatCount()));
                 }
             }
             return view;
@@ -552,8 +540,7 @@ private View getWorkoutRow(org.runnerup.workout.Step step, int level, View conve
 
         private View getLapRow(ContentValues tmp, View convertView, ViewGroup parent) {
             LayoutInflater inflater = LayoutInflater.from(RunActivity.this);
-            View view = inflater.inflate(R.layout.laplist_row, parent, false);
-            return view;
+            return inflater.inflate(R.layout.laplist_row, parent, false);
         }
 
         @Override
diff --git a/app/src/org/runnerup/view/SettingsActivity.java b/app/src/org/runnerup/view/SettingsActivity.java
index c1fe799bc..e3676df16 100644
--- a/app/src/org/runnerup/view/SettingsActivity.java
+++ b/app/src/org/runnerup/view/SettingsActivity.java
@@ -19,7 +19,6 @@
 
 import android.Manifest;
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -52,7 +51,7 @@
 
 import java.io.IOException;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class SettingsActivity extends PreferenceActivity
         implements ActivityCompat.OnRequestPermissionsResultCallback{
 
diff --git a/app/src/org/runnerup/view/StartActivity.java b/app/src/org/runnerup/view/StartActivity.java
index e6c3ab37c..4a40cd3f3 100644
--- a/app/src/org/runnerup/view/StartActivity.java
+++ b/app/src/org/runnerup/view/StartActivity.java
@@ -17,7 +17,6 @@
 
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.NotificationManager;
@@ -33,7 +32,6 @@
 import android.content.res.Resources;
 import android.database.sqlite.SQLiteDatabase;
 import android.location.Location;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
@@ -90,17 +88,17 @@
 import java.util.List;
 import java.util.Locale;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class StartActivity extends Activity implements TickListener, GpsInformation {
 
-    final static String TAB_BASIC = "basic";
-    final static String TAB_INTERVAL = "interval";
+    private final static String TAB_BASIC = "basic";
+    private final static String TAB_INTERVAL = "interval";
     final static String TAB_ADVANCED = "advanced";
-    final static String TAB_MANUAL = "manual";
+    private final static String TAB_MANUAL = "manual";
 
-    boolean skipStopGps = false;
-    Tracker mTracker = null;
-    org.runnerup.tracker.GpsStatus mGpsStatus = null;
+    private boolean skipStopGps = false;
+    private Tracker mTracker = null;
+    private org.runnerup.tracker.GpsStatus mGpsStatus = null;
 
     private TabHost tabHost = null;
     private Button startButton = null;
@@ -110,52 +108,45 @@ public class StartActivity extends Activity implements TickListener, GpsInformat
     private View gpsInfoLayout = null;
     private TextView hrInfo = null;
 
-    ImageButton hrButton = null;
-    TextView hrValueText = null;
-    FrameLayout hrLayout = null;
-    boolean batteryLevelMessageShowed = false;
-
-    ImageButton wearButton = null;
-    TextView wearValueText = null;
-    FrameLayout wearLayout = null;
-
-    TitleSpinner simpleAudioSpinner = null;
-    AudioSchemeListAdapter simpleAudioListAdapter = null;
-    TitleSpinner simpleTargetType = null;
-    TitleSpinner simpleTargetPaceValue = null;
-    TitleSpinner simpleTargetHrz = null;
-    HRZonesListAdapter hrZonesAdapter = null;
-
-    TitleSpinner intervalType = null;
-    TitleSpinner intervalTime = null;
-    TitleSpinner intervalDistance = null;
-    TitleSpinner intervalRestType = null;
-    TitleSpinner intervalRestTime = null;
-    TitleSpinner intervalRestDistance = null;
-    TitleSpinner intervalAudioSpinner = null;
-    AudioSchemeListAdapter intervalAudioListAdapter = null;
-
-    TitleSpinner advancedWorkoutSpinner = null;
-    WorkoutListAdapter advancedWorkoutListAdapter = null;
-    TitleSpinner advancedAudioSpinner = null;
-    AudioSchemeListAdapter advancedAudioListAdapter = null;
-    Button advancedDownloadWorkoutButton = null;
-    Workout advancedWorkout = null;
-    ListView advancedStepList = null;
-    final WorkoutStepsAdapter advancedWorkoutStepsAdapter = new WorkoutStepsAdapter();
-
-    boolean manualSetValue = false;
-    TitleSpinner manualSport = null;
-    TitleSpinner manualDate = null;
-    TitleSpinner manualTime = null;
-    TitleSpinner manualDistance = null;
-    TitleSpinner manualDuration = null;
-    TitleSpinner manualPace = null;
-    EditText manualNotes = null;
-
-    SQLiteDatabase mDB = null;
-
-    Formatter formatter = null;
+    private ImageButton hrButton = null;
+    private TextView hrValueText = null;
+    private FrameLayout hrLayout = null;
+    private boolean batteryLevelMessageShowed = false;
+
+    private TextView wearValueText = null;
+    private FrameLayout wearLayout = null;
+
+    private AudioSchemeListAdapter simpleAudioListAdapter = null;
+    private TitleSpinner simpleTargetType = null;
+    private TitleSpinner simpleTargetPaceValue = null;
+    private TitleSpinner simpleTargetHrz = null;
+    private HRZonesListAdapter hrZonesAdapter = null;
+
+    private TitleSpinner intervalTime = null;
+    private TitleSpinner intervalDistance = null;
+    private TitleSpinner intervalRestTime = null;
+    private TitleSpinner intervalRestDistance = null;
+    private AudioSchemeListAdapter intervalAudioListAdapter = null;
+
+    private TitleSpinner advancedWorkoutSpinner = null;
+    private WorkoutListAdapter advancedWorkoutListAdapter = null;
+    private AudioSchemeListAdapter advancedAudioListAdapter = null;
+    private Button advancedDownloadWorkoutButton = null;
+    private Workout advancedWorkout = null;
+    private final WorkoutStepsAdapter advancedWorkoutStepsAdapter = new WorkoutStepsAdapter();
+
+    private boolean manualSetValue = false;
+    private TitleSpinner manualSport = null;
+    private TitleSpinner manualDate = null;
+    private TitleSpinner manualTime = null;
+    private TitleSpinner manualDistance = null;
+    private TitleSpinner manualDuration = null;
+    private TitleSpinner manualPace = null;
+    private EditText manualNotes = null;
+
+    private SQLiteDatabase mDB = null;
+
+    private Formatter formatter = null;
     private NotificationStateManager notificationStateManager;
     private GpsSearchingState gpsSearchingState;
     private GpsBoundState gpsBoundState;
@@ -191,7 +182,7 @@ public void onCreate(Bundle savedInstanceState) {
         hrValueText = (TextView) findViewById(R.id.hr_value_text);
         hrLayout = (FrameLayout) findViewById(R.id.hr_layout);
 
-        wearButton = (ImageButton) findViewById(R.id.wear_button);
+        //ImageButton wearButton = (ImageButton) findViewById(R.id.wear_button);
         wearValueText = (TextView) findViewById(R.id.wear_value_text);
         wearLayout = (FrameLayout) findViewById(R.id.wear_layout);
 
@@ -222,7 +213,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         simpleAudioListAdapter = new AudioSchemeListAdapter(mDB, inflater, false);
         simpleAudioListAdapter.reload();
-        simpleAudioSpinner = (TitleSpinner) findViewById(R.id.basic_audio_cue_spinner);
+        TitleSpinner simpleAudioSpinner = (TitleSpinner) findViewById(R.id.basic_audio_cue_spinner);
         simpleAudioSpinner.setAdapter(simpleAudioListAdapter);
         simpleTargetType = (TitleSpinner) findViewById(R.id.tab_basic_target_type);
         simpleTargetPaceValue = (TitleSpinner) findViewById(R.id.tab_basic_target_pace_max);
@@ -231,25 +222,25 @@ public void onCreate(Bundle savedInstanceState) {
         simpleTargetHrz.setAdapter(hrZonesAdapter);
         simpleTargetType.setOnCloseDialogListener(simpleTargetTypeClick);
 
-        intervalType = (TitleSpinner) findViewById(R.id.interval_type);
+        TitleSpinner intervalType = (TitleSpinner) findViewById(R.id.interval_type);
         intervalTime = (TitleSpinner) findViewById(R.id.interval_time);
         intervalTime.setOnSetValueListener(onSetTimeValidator);
         intervalDistance = (TitleSpinner) findViewById(R.id.interval_distance);
         intervalType.setOnSetValueListener(intervalTypeSetValue);
 
-        intervalRestType = (TitleSpinner) findViewById(R.id.interval_rest_type);
+        TitleSpinner intervalRestType = (TitleSpinner) findViewById(R.id.interval_rest_type);
         intervalRestTime = (TitleSpinner) findViewById(R.id.interval_rest_time);
         intervalRestTime.setOnSetValueListener(onSetTimeValidator);
         intervalRestDistance = (TitleSpinner) findViewById(R.id.interval_rest_distance);
         intervalRestType.setOnSetValueListener(intervalRestTypeSetValue);
         intervalAudioListAdapter = new AudioSchemeListAdapter(mDB, inflater, false);
         intervalAudioListAdapter.reload();
-        intervalAudioSpinner = (TitleSpinner) findViewById(R.id.interval_audio_cue_spinner);
+        TitleSpinner intervalAudioSpinner = (TitleSpinner) findViewById(R.id.interval_audio_cue_spinner);
         intervalAudioSpinner.setAdapter(intervalAudioListAdapter);
 
         advancedAudioListAdapter = new AudioSchemeListAdapter(mDB, inflater, false);
         advancedAudioListAdapter.reload();
-        advancedAudioSpinner = (TitleSpinner) findViewById(R.id.advanced_audio_cue_spinner);
+        TitleSpinner advancedAudioSpinner = (TitleSpinner) findViewById(R.id.advanced_audio_cue_spinner);
         advancedAudioSpinner.setAdapter(advancedAudioListAdapter);
         advancedWorkoutSpinner = (TitleSpinner) findViewById(R.id.advanced_workout_spinner);
         advancedWorkoutListAdapter = new WorkoutListAdapter(inflater);
@@ -270,7 +261,7 @@ public int preSetValue(int newValue)
                 return newValue;
             }
         });
-        advancedStepList = (ListView) findViewById(R.id.advanced_step_list);
+        ListView advancedStepList = (ListView) findViewById(R.id.advanced_step_list);
         advancedStepList.setDividerHeight(0);
         advancedStepList.setAdapter(advancedWorkoutStepsAdapter);
         advancedDownloadWorkoutButton = (Button) findViewById(R.id.advanced_download_button);
@@ -333,7 +324,7 @@ public void onResume() {
             loadAdvanced(null);
         }
 
-        if (mIsBound == false || mTracker == null) {
+        if (!mIsBound || mTracker == null) {
             bindGpsTracker();
         } else {
             onGpsTrackerBound();
@@ -346,7 +337,7 @@ public void onPause() {
         super.onPause();
 
         if (getAutoStartGps()) {
-            /**
+            /*
              * If autoStartGps, then stop it during pause
              */
             stopGps();
@@ -431,7 +422,7 @@ private void unregisterStartEventListener() {
         }
     }
 
-    void onGpsTrackerBound() {
+    private void onGpsTrackerBound() {
         if (getAutoStartGps()) {
             startGps();
         } else {
@@ -459,7 +450,7 @@ void onGpsTrackerBound() {
         updateView();
     }
 
-    boolean getAutoStartGps() {
+    private boolean getAutoStartGps() {
         Context ctx = getApplicationContext();
         SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(ctx);
         return pref.getBoolean(getString(R.string.pref_startgps), false);
@@ -479,7 +470,7 @@ private void startGps() {
 
     private void stopGps() {
         Log.e(getClass().getName(), "StartActivity.stopGps() skipStop: " + this.skipStopGps);
-        if (skipStopGps == true)
+        if (skipStopGps)
             return;
 
         if (mGpsStatus != null)
@@ -491,7 +482,7 @@ private void stopGps() {
         notificationStateManager.cancelNotification();
     }
 
-    protected void notificationBatteryLevel(int batteryLevel) {
+    private void notificationBatteryLevel(int batteryLevel) {
         if ((batteryLevel < 0) || (batteryLevel > 100)) {
             return;
         }
@@ -531,14 +522,13 @@ public void onClick(DialogInterface dialog, int which) {
                 if (dontShowAgain.isChecked()) {
                     prefs.edit().putBoolean(pref_key, true).commit();
                 }
-                return;
             }
         });
 
         prompt.show();
     }
 
-    final OnTabChangeListener onTabChangeListener = new OnTabChangeListener() {
+    private final OnTabChangeListener onTabChangeListener = new OnTabChangeListener() {
 
         @Override
         public void onTabChanged(String tabId) {
@@ -556,7 +546,7 @@ else if (tabId.contentEquals(TAB_ADVANCED)) {
         }
     };
 
-    Workout prepareWorkout() {
+    private Workout prepareWorkout() {
         Context ctx = getApplicationContext();
         SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(ctx);
         SharedPreferences audioPref = null;
@@ -584,24 +574,24 @@ Workout prepareWorkout() {
         return w;
     }
 
-    final OnClickListener startButtonClick = new OnClickListener() {
+    private final OnClickListener startButtonClick = new OnClickListener() {
         public void onClick(View v) {
             if (tabHost.getCurrentTabTag().contentEquals(TAB_MANUAL)) {
                 manualSaveButtonClick.onClick(v);
                 return;
-            } else if (mGpsStatus.isEnabled() == false) {
+            } else if (!mGpsStatus.isEnabled()) {
                 startActivity(new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS));
             } else if (mTracker.getState() != TrackerState.CONNECTED) {
                 startGps();
             } else if (mTracker.getState() == TrackerState.CONNECTED) {
                 mGpsStatus.stop(StartActivity.this);
 
-                /**
+                /*
                  * unregister receivers
                  */
                 unregisterStartEventListener();
 
-                /**
+                /*
                  * This will start the advancedWorkoutSpinner!
                  */
                 mTracker.setWorkout(prepareWorkout());
@@ -618,7 +608,7 @@ public void onClick(View v) {
         }
     };
 
-    final OnClickListener hrButtonClick = new OnClickListener() {
+    private final OnClickListener hrButtonClick = new OnClickListener() {
         @Override
         public void onClick(View arg0) {
 
@@ -634,7 +624,7 @@ private void updateView() {
             int cnt0 = mGpsStatus.getSatellitesFixed();
             int cnt1 = mGpsStatus.getSatellitesAvailable();
             gpsInfoText.setVisibility(View.VISIBLE);
-            gpsInfoView1.setText(": " + cnt0 + "/" + cnt1);
+            gpsInfoView1.setText(String.format(Locale.getDefault(), ": %d/%d", cnt0, cnt1));
             gpsInfoView2.setText(getGpsAccuracy());
         }
 
@@ -644,13 +634,13 @@ private void updateView() {
             startButton.setEnabled(manualSetValue);
             startButton.setText(getString(R.string.Save_activity));
             return;
-        } else if (mGpsStatus.isEnabled() == false) {
+        } else if (!mGpsStatus.isEnabled()) {
             startButton.setEnabled(true);
             startButton.setText(getString(R.string.Enable_GPS));
-        } else if (mGpsStatus.isLogging() == false) {
+        } else if (!mGpsStatus.isLogging()) {
             startButton.setEnabled(true);
             startButton.setText(getString(R.string.Start_GPS));
-        } else if (mGpsStatus.isFixed() == false) {
+        } else if (!mGpsStatus.isFixed()) {
             startButton.setEnabled(false);
             startButton.setText(getString(R.string.Waiting_for_GPS));
             notificationStateManager.displayNotificationState(gpsSearchingState);
@@ -695,7 +685,7 @@ private void updateView() {
                 }
                 if (hrVal != null) {
                     hrButton.setEnabled(false);
-                    hrValueText.setText(Integer.toString(hrVal));
+                    hrValueText.setText(String.format(Locale.getDefault(), "%d", hrVal));
 
                     if (!batteryLevelMessageShowed) {
                         batteryLevelMessageShowed = true;
@@ -734,10 +724,11 @@ public String getGpsAccuracy() {
             Location l = mTracker.getLastKnownLocation();
 
             if (l != null && l.getAccuracy() > 0) {
-                s = String.format(Locale.getDefault(), ", %s m", l.getAccuracy());
+                s = formatter.formatDistance(Formatter.Format.TXT_LONG, l.getAccuracy());
             }
             if (mTracker.getCurrentElevation() != null) {
-                s += String.format(Locale.getDefault(), " (%.1f m)", mTracker.getCurrentElevation());
+                s += String.format(Locale.getDefault(), " ("+
+                        formatter.formatDistance(Formatter.Format.TXT_LONG, mTracker.getCurrentElevation())+")");
             }
         }
 
@@ -766,7 +757,7 @@ public void onServiceDisconnected(ComponentName className) {
         }
     };
 
-    void bindGpsTracker() {
+    private void bindGpsTracker() {
         // Establish a connection with the service. We use an explicit
         // class name because we want a specific service implementation that
         // we know will be running in our own process (and thus won't be
@@ -776,7 +767,7 @@ void bindGpsTracker() {
         mIsBound = true;
     }
 
-    void unbindGpsTracker() {
+    private void unbindGpsTracker() {
         if (mIsBound) {
             // Detach our existing connection.
             getApplicationContext().unbindService(mConnection);
@@ -798,7 +789,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         }
         if (requestCode == 112) {
             skipStopGps = false;
-            if (mIsBound == false || mTracker == null) {
+            if (!mIsBound || mTracker == null) {
                 bindGpsTracker();
             } else {
                 onGpsTrackerBound();
@@ -814,7 +805,7 @@ public void onTick() {
         updateView();
     }
 
-    final OnCloseDialogListener simpleTargetTypeClick = new OnCloseDialogListener() {
+    private final OnCloseDialogListener simpleTargetTypeClick = new OnCloseDialogListener() {
 
         @Override
         public void onClose(TitleSpinner spinner, boolean ok) {
@@ -824,7 +815,7 @@ public void onClose(TitleSpinner spinner, boolean ok) {
         }
     };
 
-    void updateTargetView() {
+    private void updateTargetView() {
         Dimension dim = Dimension.valueOf(simpleTargetType.getValueInt());
         if (dim == null) {
             simpleTargetPaceValue.setEnabled(false);
@@ -844,7 +835,7 @@ void updateTargetView() {
         }
     }
 
-    final OnSetValueListener intervalTypeSetValue = new OnSetValueListener() {
+    private final OnSetValueListener intervalTypeSetValue = new OnSetValueListener() {
 
         @Override
         public String preSetValue(String newValue)
@@ -861,7 +852,7 @@ public int preSetValue(int newValue) throws IllegalArgumentException {
         }
     };
 
-    final OnSetValueListener intervalRestTypeSetValue = new OnSetValueListener() {
+    private final OnSetValueListener intervalRestTypeSetValue = new OnSetValueListener() {
 
         @Override
         public String preSetValue(String newValue)
@@ -878,7 +869,7 @@ public int preSetValue(int newValue) throws IllegalArgumentException {
         }
     };
 
-    void loadAdvanced(String name) {
+    private void loadAdvanced(String name) {
         Context ctx = getApplicationContext();
         if (name == null) {
             SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(ctx);
@@ -904,7 +895,6 @@ public void onClick(DialogInterface dialog, int which) {
                         }
                     });
             builder.show();
-            return;
         }
     }
 
@@ -920,7 +910,7 @@ public int getSatellitesFixed() {
 
     final class WorkoutStepsAdapter extends BaseAdapter {
 
-        List<StepListEntry> steps = new ArrayList<StepListEntry>();
+        List<StepListEntry> steps = new ArrayList<>();
 
         @Override
         public int getCount() {
@@ -940,7 +930,7 @@ public long getItemId(int position) {
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
             StepListEntry entry = steps.get(position);
-            StepButton button = null;
+            StepButton button;
             if (convertView != null && convertView instanceof StepButton) {
                 button = (StepButton) convertView;
             } else {
@@ -953,7 +943,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
         }
     }
 
-    final Runnable onWorkoutChanged = new Runnable() {
+    private final Runnable onWorkoutChanged = new Runnable() {
         @Override
         public void run() {
             String name = advancedWorkoutSpinner.getValue().toString();
@@ -972,13 +962,12 @@ public void onClick(DialogInterface dialog, int which) {
                                 }
                             });
                     builder.show();
-                    return;
                 }
             }
         }
     };
 
-    final OnSetValueListener onSetTimeValidator = new OnSetValueListener() {
+    private final OnSetValueListener onSetTimeValidator = new OnSetValueListener() {
 
         @Override
         public String preSetValue(String newValue)
@@ -997,7 +986,7 @@ public int preSetValue(int newValue) throws IllegalArgumentException {
 
     };
 
-    final OnSetValueListener onSetValueManual = new OnSetValueListener() {
+    private final OnSetValueListener onSetValueManual = new OnSetValueListener() {
 
         @Override
         public String preSetValue(String newValue)
@@ -1015,7 +1004,7 @@ public int preSetValue(int newValue) throws IllegalArgumentException {
         }
     };
 
-    void setManualPace(String distance, String duration) {
+    private void setManualPace(String distance, String duration) {
         Log.e(getClass().getName(), "distance: >" + distance + "< duration: >" + duration + "<");
         double dist = SafeParse.parseDouble(distance, 0); // convert to meters
         long seconds = SafeParse.parseSeconds(duration, 0);
@@ -1026,10 +1015,9 @@ void setManualPace(String distance, String duration) {
         double pace = seconds / dist;
         manualPace.setValue(formatter.formatPace(Formatter.Format.TXT_SHORT, pace));
         manualPace.setVisibility(View.VISIBLE);
-        return;
     }
 
-    final OnSetValueListener onSetManualDistance = new OnSetValueListener() {
+    private final OnSetValueListener onSetManualDistance = new OnSetValueListener() {
 
         @Override
         public String preSetValue(String newValue)
@@ -1047,7 +1035,7 @@ public int preSetValue(int newValue) throws IllegalArgumentException {
 
     };
 
-    final OnSetValueListener onSetManualDuration = new OnSetValueListener() {
+    private final OnSetValueListener onSetManualDuration = new OnSetValueListener() {
 
         @Override
         public String preSetValue(String newValue)
@@ -1064,7 +1052,7 @@ public int preSetValue(int newValue) throws IllegalArgumentException {
         }
     };
 
-    final OnClickListener manualSaveButtonClick = new OnClickListener() {
+    private final OnClickListener manualSaveButtonClick = new OnClickListener() {
 
         @Override
         public void onClick(View v) {
diff --git a/app/src/org/runnerup/view/StartActivityHeadsetButtonReceiver.java b/app/src/org/runnerup/view/StartActivityHeadsetButtonReceiver.java
index 9b1aca941..974b5e83d 100644
--- a/app/src/org/runnerup/view/StartActivityHeadsetButtonReceiver.java
+++ b/app/src/org/runnerup/view/StartActivityHeadsetButtonReceiver.java
@@ -16,16 +16,14 @@
  */
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.view.KeyEvent;
 
 import org.runnerup.common.util.Constants;
 import org.runnerup.tracker.component.HeadsetButtonReceiver;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class StartActivityHeadsetButtonReceiver extends HeadsetButtonReceiver {
 
     public static void registerHeadsetListener(Context context) {
diff --git a/app/src/org/runnerup/view/StepButton.java b/app/src/org/runnerup/view/StepButton.java
index 6ddfa5c39..85e1b6cf8 100644
--- a/app/src/org/runnerup/view/StepButton.java
+++ b/app/src/org/runnerup/view/StepButton.java
@@ -17,12 +17,11 @@
 
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
+import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
-import android.os.Build;
 import android.util.AttributeSet;
 import android.util.Pair;
 import android.view.Gravity;
@@ -44,7 +43,9 @@
 import org.runnerup.workout.Range;
 import org.runnerup.workout.Step;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+import java.util.Locale;
+
+
 public class StepButton extends TableLayout {
 
     private final Context mContext;
@@ -64,8 +65,8 @@ public Step getStep() {
     private Step step;
     private Runnable mOnChangedListener = null;
 
-    static final boolean editRepeatCount = true;
-    static final boolean editStepButton = true;
+    private static final boolean editRepeatCount = true;
+    private static final boolean editStepButton = true;
 
     public StepButton(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -103,7 +104,7 @@ public void setStep(Step step) {
         mIntensity.setText(res.getText(step.getIntensity().getTextId()));
         if (step.getIntensity() == Intensity.REPEAT) {
             mDurationType.setText("");
-            mDurationValue.setText("" + step.getRepeatCount());
+            mDurationValue.setText(String.format(Locale.getDefault(), "%d", step.getRepeatCount()));
             mGoalRow.setVisibility(View.GONE);
             if (editRepeatCount)
                 mLayout.setOnClickListener(onRepeatClickListener);
@@ -125,17 +126,16 @@ public void setStep(Step step) {
         } else {
             mGoalRow.setVisibility(View.VISIBLE);
             mGoalType.setText(res.getString(goalType.getTextId()));
-            mGoalValue.setText(formatter.format(Formatter.Format.TXT_SHORT, goalType,
-                    step.getTargetValue().minValue)
-                    + "-" +
-                    formatter.format(Formatter.Format.TXT_LONG, goalType, step.getTargetValue().maxValue));
+            mGoalValue.setText(String.format(Locale.getDefault(), "%s-%s",
+                    formatter.format(Formatter.Format.TXT_SHORT, goalType, step.getTargetValue().minValue),
+                    formatter.format(Formatter.Format.TXT_LONG, goalType, step.getTargetValue().maxValue)));
         }
         if (editStepButton) {
             mLayout.setOnClickListener(onStepClickListener);
         }
     }
 
-    final OnClickListener onRepeatClickListener = new OnClickListener() {
+    private final OnClickListener onRepeatClickListener = new OnClickListener() {
 
         @Override
         public void onClick(View v) {
@@ -154,7 +154,7 @@ public void onClick(View v) {
             alert.setView(layout);
             alert.setPositiveButton(getResources().getString(R.string.OK), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int whichButton) {
-                    step.setRepeatCount(numberPicker.getValue());
+                    step.setRepeatCount(numberPicker.getValueInt());
                     dialog.dismiss();
                     setStep(step); // redraw
                     if (mOnChangedListener != null) {
@@ -173,7 +173,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
         }
     };
 
-    final OnClickListener onStepClickListener = new OnClickListener() {
+    private final OnClickListener onStepClickListener = new OnClickListener() {
 
         @Override
         public void onClick(View v) {
@@ -181,7 +181,7 @@ public void onClick(View v) {
             alert.setTitle(getResources().getString(R.string.Edit_step));
 
             final LayoutInflater inflater = LayoutInflater.from(mContext);
-            final View layout = inflater.inflate(
+            @SuppressLint("InflateParams") final View layout = inflater.inflate(
                     R.layout.step_dialog, null);
 
             final Runnable save = setupEditStep(inflater, layout);
@@ -206,7 +206,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
         }
     };
 
-    Runnable setupEditStep(LayoutInflater inflator, View layout) {
+    private Runnable setupEditStep(LayoutInflater inflator, View layout) {
         final TitleSpinner stepType = (TitleSpinner) layout.findViewById(R.id.step_intensity);
         stepType.setValue(step.getIntensity().getValue());
 
diff --git a/app/src/org/runnerup/view/UploadActivity.java b/app/src/org/runnerup/view/UploadActivity.java
index 46e9e3338..9305d494f 100644
--- a/app/src/org/runnerup/view/UploadActivity.java
+++ b/app/src/org/runnerup/view/UploadActivity.java
@@ -18,7 +18,6 @@
 package org.runnerup.view;
 
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.app.ListActivity;
 import android.content.Context;
 import android.content.Intent;
@@ -51,26 +50,27 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
+
 
-@TargetApi(Build.VERSION_CODES.FROYO)
 public class UploadActivity extends ListActivity implements Constants {
 
-    long synchronizerID = -1;
-    String synchronizer = null;
-    Integer synchronizerIcon = null;
-    SyncManager.SyncMode syncMode = SyncManager.SyncMode.UPLOAD;
-    SyncManager syncManager = null;
+    private long synchronizerID = -1;
+    private String synchronizer = null;
+    private Integer synchronizerIcon = null;
+    private SyncManager.SyncMode syncMode = SyncManager.SyncMode.UPLOAD;
+    private SyncManager syncManager = null;
 
-    SQLiteDatabase mDB = null;
-    Formatter formatter = null;
-    final List<SyncActivityItem> allSyncActivities = new ArrayList<SyncActivityItem>();
+    private SQLiteDatabase mDB = null;
+    private Formatter formatter = null;
+    private final List<SyncActivityItem> allSyncActivities = new ArrayList<>();
 
-    int syncCount = 0;
-    Button actionButton = null;
-    CharSequence actionButtonText = null;
+    private int syncCount = 0;
+    private Button actionButton = null;
+    private CharSequence actionButtonText = null;
 
-    boolean fetching = false;
-    final StringBuffer cancelSync = new StringBuffer();
+    private boolean fetching = false;
+    private final StringBuffer cancelSync = new StringBuffer();
 
     /** Called when the activity is first created. */
 
@@ -138,8 +138,8 @@ public void onCreate(Bundle savedInstanceState) {
 
     @Override
     public void onBackPressed() {
-        if (fetching == true) {
-            /**
+        if (fetching) {
+            /*
              * Cancel
              */
             cancelSync.append("1");
@@ -155,7 +155,7 @@ public void onDestroy() {
         syncManager.close();
     }
 
-    void fillData() {
+    private void fillData() {
         if (syncMode.equals(SyncManager.SyncMode.DOWNLOAD)) {
             syncManager.load(synchronizer);
             syncManager.loadActivityList(allSyncActivities, synchronizer, new SyncManager.Callback() {
@@ -195,7 +195,7 @@ public void run(String synchronizerName, Status status) {
     }
 
     private void filterAlreadyPresentActivities() {
-        List<SyncActivityItem> presentActivities = new ArrayList<SyncActivityItem>();
+        List<SyncActivityItem> presentActivities = new ArrayList<>();
         final String[] from = new String[]{
                 DB.PRIMARY_KEY, DB.ACTIVITY.START_TIME,
                 DB.ACTIVITY.DISTANCE, DB.ACTIVITY.TIME, DB.ACTIVITY.SPORT
@@ -235,10 +235,10 @@ private void updateSyncCount() {
         }
     }
 
-    void requery() {
+    private void requery() {
         ((BaseAdapter) this.getListAdapter()).notifyDataSetChanged();
         if (syncCount > 0) {
-            actionButton.setText(actionButtonText + " (" + syncCount + ")");
+            actionButton.setText(String.format(Locale.getDefault(), "%s (%d)", actionButtonText, syncCount));
             actionButton.setEnabled(true);
         } else {
             actionButton.setText(actionButtonText);
@@ -246,7 +246,7 @@ void requery() {
         }
     }
 
-    final OnClickListener onActivityClick = new OnClickListener() {
+    private final OnClickListener onActivityClick = new OnClickListener() {
 
         @Override
         public void onClick(View arg0) {
@@ -367,7 +367,7 @@ public View getView(int arg0, View convertView, ViewGroup parent) {
         }
     }
 
-    final OnCheckedChangeListener checkedChangeClick = new OnCheckedChangeListener() {
+    private final OnCheckedChangeListener checkedChangeClick = new OnCheckedChangeListener() {
 
         @Override
         public void onCheckedChanged(CompoundButton arg0, boolean arg1) {
@@ -380,7 +380,7 @@ public void onCheckedChanged(CompoundButton arg0, boolean arg1) {
 
     };
 
-    final OnClickListener uploadButtonClick = new OnClickListener() {
+    private final OnClickListener uploadButtonClick = new OnClickListener() {
         @Override
         public void onClick(View v) {
             if (allSyncActivities.isEmpty()) {
@@ -396,7 +396,7 @@ public void onClick(View v) {
 
 
 
-    final OnClickListener downloadButtonClick = new OnClickListener() {
+    private final OnClickListener downloadButtonClick = new OnClickListener() {
         @Override
         public void onClick(View v) {
             if (allSyncActivities.isEmpty()) {
@@ -411,7 +411,7 @@ public void onClick(View v) {
     };
 
     private List<SyncActivityItem> getSelectedActivities() {
-        List<SyncActivityItem> selected = new ArrayList<SyncActivityItem>();
+        List<SyncActivityItem> selected = new ArrayList<>();
         for (SyncActivityItem tmp : allSyncActivities) {
             if (tmp.synchronize(syncMode))
                 selected.add(tmp);
@@ -419,7 +419,7 @@ private List<SyncActivityItem> getSelectedActivities() {
         return selected;
     }
 
-    final SyncManager.Callback syncCallback = new SyncManager.Callback() {
+    private final SyncManager.Callback syncCallback = new SyncManager.Callback() {
 
         @Override
         public void run(String synchronizerName, Status status) {
@@ -437,7 +437,7 @@ public void run(String synchronizerName, Status status) {
         }
     };
 
-    final OnClickListener clearAllButtonClick = new OnClickListener() {
+    private final OnClickListener clearAllButtonClick = new OnClickListener() {
         @Override
         public void onClick(View v) {
             for (SyncActivityItem tmp : allSyncActivities) {
@@ -450,7 +450,7 @@ public void onClick(View v) {
         }
     };
 
-    final OnClickListener setAllButtonClick = new OnClickListener() {
+    private final OnClickListener setAllButtonClick = new OnClickListener() {
         @Override
         public void onClick(View v) {
             for (SyncActivityItem tmp : allSyncActivities) {
diff --git a/app/src/org/runnerup/view/WorkoutListAdapter.java b/app/src/org/runnerup/view/WorkoutListAdapter.java
index aeff8fdc0..c4cbb0b14 100644
--- a/app/src/org/runnerup/view/WorkoutListAdapter.java
+++ b/app/src/org/runnerup/view/WorkoutListAdapter.java
@@ -17,9 +17,7 @@
 
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -31,14 +29,14 @@
 import java.io.File;
 import java.io.FilenameFilter;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 class WorkoutListAdapter extends BaseAdapter {
 
     /**
 	 * 
 	 */
-    LayoutInflater inflater = null;
-    String[] workoutList = new String[0];
+    private LayoutInflater inflater = null;
+    private String[] workoutList = new String[0];
 
     public WorkoutListAdapter(LayoutInflater inflater) {
         super();
@@ -83,11 +81,7 @@ public int find(String name) {
     public void reload() {
         String[] list = load(inflater.getContext());
         if (list == null) {
-            if (workoutList != null && workoutList.length == 0) {
-                // return;
-            } else {
-                workoutList = new String[0];
-            }
+            workoutList = new String[0];
         } else {
             workoutList = new String[list.length];
             int index = 0;
diff --git a/app/src/org/runnerup/widget/DisabledEntriesAdapter.java b/app/src/org/runnerup/widget/DisabledEntriesAdapter.java
index 8b73d3b68..70a8e7908 100644
--- a/app/src/org/runnerup/widget/DisabledEntriesAdapter.java
+++ b/app/src/org/runnerup/widget/DisabledEntriesAdapter.java
@@ -1,8 +1,23 @@
+/*
+ * Copyright (C) 2014 jonas.oreland@gmail.com
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package org.runnerup.widget;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,15 +26,12 @@
 
 import java.util.HashSet;
 
-/**
- * Created by jonas on 9/18/14.
- */
-@TargetApi(Build.VERSION_CODES.FROYO)
-public class DisabledEntriesAdapter extends BaseAdapter {
 
-    String[] entries;
-    LayoutInflater inflator;
-    HashSet<String> disabled;
+class DisabledEntriesAdapter extends BaseAdapter {
+
+    private final String[] entries;
+    private final LayoutInflater inflator;
+    private HashSet<String> disabled;
 
     public DisabledEntriesAdapter(Context ctx, int id) {
         inflator = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -28,7 +40,7 @@ public DisabledEntriesAdapter(Context ctx, int id) {
 
     public void addDisabled(int i) {
         if (disabled == null)
-            disabled = new HashSet<String>();
+            disabled = new HashSet<>();
         if (i < entries.length)
             disabled.add(entries[i]);
     }
@@ -87,9 +99,6 @@ public boolean isEnabled(int position) {
         if (str == null)
             return true;
 
-        if (disabled.contains(str))
-            return false;
-
-        return true;
+        return !disabled.contains(str);
     }
 }
diff --git a/app/src/org/runnerup/widget/DistancePicker.java b/app/src/org/runnerup/widget/DistancePicker.java
index 095abf9eb..43debd6d3 100644
--- a/app/src/org/runnerup/widget/DistancePicker.java
+++ b/app/src/org/runnerup/widget/DistancePicker.java
@@ -17,9 +17,7 @@
 
 package org.runnerup.widget;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.widget.LinearLayout;
@@ -27,19 +25,19 @@
 
 import org.runnerup.util.Formatter;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class DistancePicker extends LinearLayout {
 
-    long baseUnitMeters;
+    private double baseUnitMeters;
 
-    final NumberPicker unitMeters; // e.g km or mi
-    final TextView unitString;
-    final NumberPicker meters;
+    private final NumberPicker unitMeters; // e.g km or mi
+    private final TextView unitString;
 
     public DistancePicker(Context context, AttributeSet attrs) {
         super(context, attrs);
 
-        unitMeters = new NumberPicker(context, attrs);
+        Formatter f = new Formatter(context);
+        unitMeters = new NumberPicker(context, attrs, true, f.getUnitDecimals());
         LinearLayout unitStringLayout = new LinearLayout(context, attrs);
         unitStringLayout.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL);
         unitStringLayout.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
@@ -47,49 +45,34 @@ public DistancePicker(Context context, AttributeSet attrs) {
         unitString = new TextView(context, attrs);
         unitString.setTextSize(25);
         unitStringLayout.addView(unitString);
-        meters = new NumberPicker(context, attrs);
-
         unitMeters.setOrientation(VERTICAL);
-        meters.setDigits(4);
-        meters.setOrientation(VERTICAL);
 
         setOrientation(HORIZONTAL);
         setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
                 LayoutParams.WRAP_CONTENT));
         addView(unitMeters);
         addView(unitStringLayout);
-        addView(meters);
 
-        {
-            Formatter f = new Formatter(context);
-            setBaseUint((long) f.getUnitMeters(), f.getUnitString());
-        }
+        setBaseUnit(f.getUnitMeters(), f.getUnitString());
     }
 
-    public void setBaseUint(long baseUnit, String baseString) {
+    private void setBaseUnit(double baseUnit, String baseString) {
         baseUnitMeters = baseUnit;
         unitString.setText(baseString);
-        meters.setRange(0, (int) baseUnitMeters - 1, true);
     }
 
-    public long getDistance() {
-        long ret = 0;
-        ret += meters.getValue();
-        ret += (long) unitMeters.getValue() * baseUnitMeters;
-        return ret;
+    public double getDistance() {
+        return unitMeters.getValue() * baseUnitMeters;
     }
 
-    public void setDistance(long s) {
-        long h = s / baseUnitMeters;
-        s -= h * baseUnitMeters;
-        unitMeters.setValue((int) h);
-        meters.setValue((int) s);
+    public void setDistance(double s) {
+        double h = s / baseUnitMeters;
+        unitMeters.setValue(h);
     }
 
     @Override
     public void setEnabled(boolean enabled) {
         super.setEnabled(enabled);
         unitMeters.setEnabled(enabled);
-        meters.setEnabled(enabled);
     }
 }
diff --git a/app/src/org/runnerup/widget/DurationPicker.java b/app/src/org/runnerup/widget/DurationPicker.java
index 2fa06f42f..5f72301b9 100644
--- a/app/src/org/runnerup/widget/DurationPicker.java
+++ b/app/src/org/runnerup/widget/DurationPicker.java
@@ -17,18 +17,16 @@
 
 package org.runnerup.widget;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.util.AttributeSet;
 import android.widget.LinearLayout;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class DurationPicker extends LinearLayout {
 
-    final NumberPicker hours;
-    final NumberPicker minutes;
-    final NumberPicker seconds;
+    private final NumberPicker hours;
+    private final NumberPicker minutes;
+    private final NumberPicker seconds;
 
     public DurationPicker(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -51,9 +49,9 @@ public DurationPicker(Context context, AttributeSet attrs) {
 
     public long getEpochTime() {
         long ret = 0;
-        ret += seconds.getValue();
-        ret += (long) minutes.getValue() * 60;
-        ret += (long) hours.getValue() * 60 * 60;
+        ret += seconds.getValueInt();
+        ret += (long) minutes.getValueInt() * 60;
+        ret += (long) hours.getValueInt() * 60 * 60;
         return ret;
     }
 
diff --git a/app/src/org/runnerup/widget/NumberPicker.java b/app/src/org/runnerup/widget/NumberPicker.java
index 6ecd90a20..56eb84900 100644
--- a/app/src/org/runnerup/widget/NumberPicker.java
+++ b/app/src/org/runnerup/widget/NumberPicker.java
@@ -17,13 +17,15 @@
 
 package org.runnerup.widget;
 
-import android.annotation.TargetApi;
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build;
 import android.os.Handler;
 import android.text.InputType;
+import android.text.method.DigitsKeyListener;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
@@ -33,44 +35,53 @@
 
 import org.runnerup.R;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+import java.text.DecimalFormatSymbols;
+
+
 public class NumberPicker extends LinearLayout {
 
     public interface OnChangedListener {
-        void onChanged(NumberPicker picker, int oldVal, int newVal);
+        void onChanged(NumberPicker picker, double oldVal, double newVal);
     }
 
     public interface Formatter {
-        String toString(int value);
+        String toString(double value);
     }
 
-    int prevValue;
-    int currValue;
-    int minValue = MIN_VAL;
-    int maxValue = MAX_VAL;
-    boolean wrapValue = true;
+    //The NumberPicker is used for both integer values like steps and float values like distance
+    //Integer representation is about 16 digits
+    private double prevValue;
+    private double currValue;
+    private int minValue = MIN_VAL;
+    private int maxValue = MAX_VAL;
+    private boolean wrapValue = true;
 
-    final static int DIGITS = 2;
-    final static int MIN_VAL = 0;
-    final static int MAX_VAL = 59;
+    private final static int DIGITS = 2;
+    private final static int MIN_VAL = 0;
+    private final static int MAX_VAL = 59;
 
-    EditText valueText;
-    OnChangedListener listener;
+    private EditText valueText;
+    private OnChangedListener listener;
 
-    Button decButton;
-    Button incButton;
+    private Button decButton;
+    private Button incButton;
 
-    boolean longInc = false;
-    boolean longDec = false;
-    final Handler longHandler = new Handler();
-    final long longSpeed = 300;
-    final int textSize = 25;
-    int digits = DIGITS;
-    String fmtString = "%0" + digits + "d";
+    private boolean longInc = false;
+    private boolean longDec = false;
+    private final Handler longHandler = new Handler();
+    private final int textSize = 25;
+    private int digits;// DIGITS
+    private String fmtString;// "%0" + digits + "d"
+    private Boolean floatInput;// false
 
     public NumberPicker(Context context, AttributeSet attrs) {
+        this(context, attrs, false, DIGITS);
+    }
+    public NumberPicker(Context context, AttributeSet attrs, Boolean floatInput, int digits) {
         super(context, attrs);
 
+        this.floatInput = floatInput;
+        this.digits = digits;
         createValueText(context);
         createButton(context, '+');
         createButton(context, '-');
@@ -82,7 +93,7 @@ public NumberPicker(Context context, AttributeSet attrs) {
         updateView();
 
         if (attrs != null) {
-            TypedArray arr = context.obtainStyledAttributes(attrs, R.styleable.TitleSpinner);
+            TypedArray arr = context.obtainStyledAttributes(attrs, R.styleable.NumberPicker);
             processAttributes(arr);
             arr.recycle();
         }
@@ -92,14 +103,14 @@ private void processAttributes(TypedArray arr) {
         if (arr == null)
             return;
 
-        if (arr.hasValue(R.styleable.TitleSpinner_digits)) {
-            setDigits(arr.getInt(R.styleable.TitleSpinner_digits, digits));
+        if (arr.hasValue(R.styleable.NumberPicker_digits)) {
+            setDigits(arr.getInt(R.styleable.NumberPicker_digits, digits));
         }
-        if (arr.hasValue(R.styleable.TitleSpinner_min_val)) {
-            minValue = arr.getInt(R.styleable.TitleSpinner_min_val, minValue);
+        if (arr.hasValue(R.styleable.NumberPicker_min_val)) {
+            minValue = arr.getInt(R.styleable.NumberPicker_min_val, minValue);
         }
-        if (arr.hasValue(R.styleable.TitleSpinner_max_val)) {
-            maxValue = arr.getInt(R.styleable.TitleSpinner_max_val, maxValue);
+        if (arr.hasValue(R.styleable.NumberPicker_max_val)) {
+            maxValue = arr.getInt(R.styleable.NumberPicker_max_val, maxValue);
         }
     }
 
@@ -119,7 +130,7 @@ private void addViews() {
 
     private void createButton(Context context, char c) {
         Button b = new Button(context);
-        b.setText("" + c);
+        b.setText(Character.toString(c));
         b.setTextSize(textSize);
         b.setOnClickListener(buttonClick);
         b.setOnLongClickListener(buttonLongClick);
@@ -143,11 +154,23 @@ public void onFocusChange(View v, boolean hasFocus) {
                 }
             }
         });
-        valueText.setInputType(InputType.TYPE_CLASS_NUMBER);
+        if (floatInput) {
+            valueText.setInputType(InputType.TYPE_NUMBER_FLAG_DECIMAL);
+            if (Build.VERSION.SDK_INT >= 9) {
+                //"other" separators in for instance Arabic/Persian
+                //Android (before 8.0) only parses '.' (bug)
+                char separator = DecimalFormatSymbols.getInstance().getDecimalSeparator();
+                valueText.setKeyListener(DigitsKeyListener.getInstance("0123456789.," + separator));
+            }
+            fmtString = "%." + digits + "f";
+        } else {
+            valueText.setInputType(InputType.TYPE_CLASS_NUMBER);
+            fmtString = "%0" + digits + "d";
+        }
         valueText.setGravity(Gravity.CENTER_VERTICAL | Gravity.CENTER_HORIZONTAL);
     }
 
-    final Runnable longPressUpdater = new Runnable() {
+    private final Runnable longPressUpdater = new Runnable() {
         public void run() {
             if (longInc) {
                 setValueImpl(currValue + 1);
@@ -156,11 +179,12 @@ public void run() {
             } else {
                 return;
             }
+            long longSpeed = 300;
             longHandler.postDelayed(this, longSpeed);
         }
     };
 
-    private void setValueImpl(int newValue) {
+    private void setValueImpl(double newValue) {
         if (newValue < minValue) {
             if (wrapValue)
                 newValue = maxValue;
@@ -172,7 +196,7 @@ private void setValueImpl(int newValue) {
             else
                 newValue = maxValue;
         }
-        int save = prevValue;
+        double save = prevValue;
         prevValue = currValue;
         currValue = newValue;
         if (listener != null)
@@ -185,7 +209,7 @@ private void updateView() {
         valueText.selectAll();
     }
 
-    final OnClickListener buttonClick = new OnClickListener() {
+    private final OnClickListener buttonClick = new OnClickListener() {
         @Override
         public void onClick(View v) {
             validateInput(valueText);
@@ -198,7 +222,7 @@ public void onClick(View v) {
         }
     };
 
-    void buttonLongClick(int i) {
+    private void buttonLongClick(int i) {
         valueText.clearFocus();
         if (i < 0) {
             longDec = true;
@@ -213,7 +237,7 @@ void buttonLongClick(int i) {
         longHandler.post(longPressUpdater);
     }
 
-    final OnLongClickListener buttonLongClick = new OnLongClickListener() {
+    private final OnLongClickListener buttonLongClick = new OnLongClickListener() {
         @Override
         public boolean onLongClick(View v) {
             if (v == incButton)
@@ -224,27 +248,41 @@ public boolean onLongClick(View v) {
         }
     };
 
-    final OnTouchListener buttonLongTouchListener = new OnTouchListener() {
+    private final OnTouchListener buttonLongTouchListener = new OnTouchListener() {
         @Override
+        @SuppressLint("ClickableViewAccessibility")
         public boolean onTouch(View v, MotionEvent event) {
             if (event.getAction() == MotionEvent.ACTION_UP &&
                     ((longInc && v == incButton) ||
                     (longDec && v == decButton))) {
                 buttonLongClick(0);
+                return true;
             }
             return false;
         }
     };
 
-    protected void validateInput(EditText tv) {
+    private void validateInput(EditText tv) {
         String str = String.valueOf(tv.getText());
         if ("".equals(str)) {
             updateView();
         } else {
             try {
-                int l = Integer.valueOf(str);
-                setValueImpl(l);
+                if (floatInput) {
+                    if (Build.VERSION.SDK_INT >= 9) {
+                        char separator = DecimalFormatSymbols.getInstance().getDecimalSeparator();
+                        str = str.replace('.', separator).replace(',', separator);
+                    } else {
+                        str = str.replace(',', '.');
+                    }
+                    Double l = Double.parseDouble(str);
+                    setValueImpl(l);
+                } else {
+                    int l = Integer.valueOf(str);
+                    setValueImpl(l);
+                }
             } catch (NumberFormatException ex) {
+                Log.i("NumberPicker", "Failed to validateInput for: " + str+ex);
             }
         }
     }
@@ -269,25 +307,25 @@ public void setOrientation(int orientation) {
         }
     }
 
-    final Formatter formatter = new Formatter() {
+    private final Formatter formatter = new Formatter() {
         final StringBuilder builder = new StringBuilder();
         final java.util.Formatter fmt = new java.util.Formatter(builder);
         final Object[] args = new Object[1];
 
-        public String toString(int value) {
-            args[0] = value;
+        public String toString(double value) {
+
+            args[0] = floatInput ? value : (int) Math.round(value);
+            if (floatInput) {
+                args[0] = value;
+            } else {
+                args[0] = (int) Math.round(value);
+            }
             builder.delete(0, builder.length());
             fmt.format(fmtString, args);
             return fmt.toString();
         }
     };
 
-    public void setRange(int min, int max, boolean wrap) {
-        this.minValue = min;
-        this.maxValue = max;
-        this.wrapValue = wrap;
-    }
-
     public void setDigits(int digits) {
         this.digits = digits;
         fmtString = "%0" + digits + "d";
@@ -299,11 +337,19 @@ public void setValue(int newValue) {
         setValueImpl(newValue);
     }
 
-    public int getValue() {
+    public void setValue(double newValue) {
+        setValueImpl(newValue);
+    }
+
+    public double getValue() {
         validateInput(valueText);
         return currValue;
     }
 
+    public int getValueInt() {
+        return (int)Math.round(getValue());
+    }
+
     private void readd() {
         removeView(incButton);
         removeView(decButton);
diff --git a/app/src/org/runnerup/widget/TextPreference.java b/app/src/org/runnerup/widget/TextPreference.java
index a3b60732f..cfb6d6995 100644
--- a/app/src/org/runnerup/widget/TextPreference.java
+++ b/app/src/org/runnerup/widget/TextPreference.java
@@ -17,16 +17,14 @@
 
 package org.runnerup.widget;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.Resources;
-import android.os.Build;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 
 import org.runnerup.R;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class TextPreference extends android.preference.EditTextPreference {
 
     public TextPreference(Context context) {
@@ -44,7 +42,7 @@ public TextPreference(Context context, AttributeSet attrs, int defStyle) {
         this.context = context;
     }
 
-    private Context context;
+    private final Context context;
 
     @Override
     protected void onSetInitialValue(boolean restorePersistedValue,
diff --git a/app/src/org/runnerup/widget/TitleSpinner.java b/app/src/org/runnerup/widget/TitleSpinner.java
index e09da9930..caef9bae8 100644
--- a/app/src/org/runnerup/widget/TitleSpinner.java
+++ b/app/src/org/runnerup/widget/TitleSpinner.java
@@ -17,18 +17,17 @@
 
 package org.runnerup.widget;
 
-import android.annotation.TargetApi;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.res.TypedArray;
-import android.os.Build;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -44,6 +43,7 @@
 import android.widget.TimePicker;
 
 import org.runnerup.R;
+import org.runnerup.util.Formatter;
 import org.runnerup.util.SafeParse;
 
 import java.text.DateFormat;
@@ -51,7 +51,7 @@
 import java.util.Date;
 import java.util.Locale;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class TitleSpinner extends LinearLayout {
 
     private enum Type {
@@ -69,7 +69,7 @@ private enum Type {
     private TextView mTitle = null;
     private TextView mValue = null;
     private Spinner mSpinner = null;
-    int mInputType = 0;
+    private int mInputType = 0;
     private final Context mContext;
     private OnSetValueListener mSetValueListener = null;
     private OnCloseDialogListener mCloseDialogListener = null;
@@ -84,18 +84,18 @@ public interface OnSetValueListener {
          * @return
          * @throws java.lang.IllegalArgumentException
          */
-        public String preSetValue(String newValue) throws java.lang.IllegalArgumentException;
+        String preSetValue(String newValue) throws java.lang.IllegalArgumentException;
 
         /**
          * @param newValue
          * @return
          * @throws java.lang.IllegalArgumentException
          */
-        public int preSetValue(int newValue) throws java.lang.IllegalArgumentException;
+        int preSetValue(int newValue) throws java.lang.IllegalArgumentException;
     }
 
     public interface OnCloseDialogListener {
-        public void onClose(TitleSpinner spinner, boolean ok);
+        void onClose(TitleSpinner spinner, boolean ok);
     }
 
     public TitleSpinner(Context context, AttributeSet attrs) {
@@ -115,7 +115,6 @@ public TitleSpinner(Context context, AttributeSet attrs) {
         if (title != null) {
             mTitle.setText(title);
         }
-        //Note: R.styleable.TitleSpinner_android_prompt is not used
 
         CharSequence type = arr.getString(R.styleable.TitleSpinner_type);
         CharSequence defaultValue = arr.getString(R.styleable.TitleSpinner_android_defaultValue);
@@ -419,15 +418,12 @@ public void onClick(View v) {
                 alert.setView(layout);
                 alert.setPositiveButton(getResources().getString(R.string.OK), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int whichButton) {
-                        setValue(getValue(distancePicker));
+                        double dist = distancePicker.getDistance();
+                        setValue(((Long)Math.round(dist)).toString(), dist, true);
                         dialog.dismiss();
                         layout.removeView(distancePicker);
                         onClose(true);
                     }
-
-                    private String getValue(DistancePicker dp) {
-                        return Long.toString(dp.getDistance());
-                    }
                 });
                 alert.setNegativeButton(getResources().getString(R.string.Cancel), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int whichButton) {
@@ -470,7 +466,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
                     }
 
                     private String getValue(NumberPicker dp) {
-                        return Integer.toString(dp.getValue());
+                        return Integer.toString(dp.getValueInt());
                     }
                 });
                 alert.setNegativeButton(getResources().getString(R.string.Cancel), new DialogInterface.OnClickListener() {
@@ -504,9 +500,11 @@ private void onClose(boolean b) {
             mCloseDialogListener.onClose(this, b);
     }
 
-    public void setTitle(String title) {
-        mTitle.setText(title);
-    }
+// --Commented out by Inspection START (2017-08-11 13:10):
+//    public void setTitle(String title) {
+//        mTitle.setText(title);
+//    }
+// --Commented out by Inspection STOP (2017-08-11 13:10)
 
     private void loadValue(String defaultValue) {
         SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mContext);
@@ -537,12 +535,18 @@ public void setValue(String value) {
         setValue (value, true);
     }
 
-    public void setValue(CharSequence value, Boolean savePreferences) {
+    private void setValue(CharSequence value, Boolean savePreferences) {
         String str = value == null ? "" : value.toString();
         setValue(str, savePreferences);
     }
 
-    public void setValue(String value, Boolean savePreferences) {
+    private void setValue(String value, Boolean savePreferences) {
+        //Handle default values
+        Double valInt = TextUtils.isEmpty(value) || "0".equals(value) ? 0.0 : null;
+        setValue(value, valInt, savePreferences);
+    }
+
+    private void setValue(String value, Double valInt, Boolean savePreferences) {
         if (mSetValueListener != null) {
             try {
                 value = mSetValueListener.preSetValue(value);
@@ -557,10 +561,15 @@ public void setValue(String value, Boolean savePreferences) {
         } else if (mType == Type.TS_DURATIONPICKER) {
             mCurrValue = SafeParse.parseSeconds(value, 0);
         } else {
-            mCurrValue = (long) SafeParse.parseDouble(value.toString(), 0);
+            mCurrValue = (long) SafeParse.parseDouble(value, 0);
         }
         if (mType == Type.TS_DISTANCEPICKER && !TextUtils.isEmpty(value)) {
-            mValue.setText(String.format("%s %s", value, getResources().getString(R.string.metrics_distance_m)));
+            if (valInt != null) {
+                Formatter f = new Formatter(this.mContext);
+                mValue.setText(f.formatDistance(Formatter.Format.TXT_LONG, valInt));
+            } else {
+                mValue.setText(String.format("%s %s", value, getResources().getString(R.string.metrics_distance_m)));
+            }
         } else {
             mValue.setText(value);
         }
@@ -587,7 +596,7 @@ private int find(SpinnerAdapter adapter, String value) {
         return 0;
     }
 
-    int getSelectionValue(int value) {
+    private int getSelectionValue(int value) {
         if (values == null)
             return value;
         int p = 0;
@@ -601,7 +610,7 @@ int getSelectionValue(int value) {
         return 0;
     }
 
-    int getRealValue(int value) {
+    private int getRealValue(int value) {
         if (values == null)
             return value;
         if (value >= 0 && value < values.length)
diff --git a/app/src/org/runnerup/widget/WidgetUtil.java b/app/src/org/runnerup/widget/WidgetUtil.java
index 241efb167..885ed79dc 100644
--- a/app/src/org/runnerup/widget/WidgetUtil.java
+++ b/app/src/org/runnerup/widget/WidgetUtil.java
@@ -17,13 +17,10 @@
 
 package org.runnerup.widget;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -32,17 +29,15 @@
 
 import org.runnerup.R;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class WidgetUtil {
 
     public static void setEditable(EditText editText, boolean onoff) {
-        if (onoff == true) {
-            editText.setClickable(onoff);
-            editText.setFocusable(onoff);
+        editText.setClickable(onoff);
+        editText.setFocusable(onoff);
+        if (onoff) {
+            //noinspection ConstantConditions
             editText.setFocusableInTouchMode(onoff);
-        } else {
-            editText.setClickable(onoff);
-            editText.setFocusable(onoff);
         }
     }
 
@@ -63,7 +58,7 @@ public static View createHoloTabIndicator(Context ctx, String title) {
     }
 
     @SuppressWarnings("deprecation")
-    @TargetApi(16)
+    
     public static void setBackground(View v, Drawable d) {
         if (Build.VERSION.SDK_INT < 16) {
             v.setBackgroundDrawable(d);
diff --git a/app/src/org/runnerup/workout/AutoPauseTrigger.java b/app/src/org/runnerup/workout/AutoPauseTrigger.java
index 774a9c016..e8408ca1a 100644
--- a/app/src/org/runnerup/workout/AutoPauseTrigger.java
+++ b/app/src/org/runnerup/workout/AutoPauseTrigger.java
@@ -17,11 +17,9 @@
 
 package org.runnerup.workout;
 
-import android.annotation.TargetApi;
 import android.location.Location;
-import android.os.Build;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class AutoPauseTrigger extends Trigger {
     private final float mAutoPauseAfterSeconds;
     private final float mAutoPauseMinSpeed;
diff --git a/app/src/org/runnerup/workout/Dimension.java b/app/src/org/runnerup/workout/Dimension.java
index 9bf9b5e21..84abe4f17 100644
--- a/app/src/org/runnerup/workout/Dimension.java
+++ b/app/src/org/runnerup/workout/Dimension.java
@@ -41,7 +41,7 @@ public enum Dimension {
     int value = 0;
     int textId = 0;
 
-    private Dimension(int val, int textId) {
+    Dimension(int val, int textId) {
         this.value = val;
         this.textId = textId;
     }
@@ -58,9 +58,7 @@ public int getTextId() {
     }
 
     public boolean equal(Dimension what) {
-        if (what == null || what.value != this.value)
-            return false;
-        return true;
+        return !(what == null || what.value != this.value);
     }
 
     public static Dimension valueOf(int val) {
diff --git a/app/src/org/runnerup/workout/EndOfLapSuppression.java b/app/src/org/runnerup/workout/EndOfLapSuppression.java
index 26f5461f9..859b24813 100644
--- a/app/src/org/runnerup/workout/EndOfLapSuppression.java
+++ b/app/src/org/runnerup/workout/EndOfLapSuppression.java
@@ -17,8 +17,6 @@
 
 package org.runnerup.workout;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 import android.util.Log;
 
 /**
@@ -27,7 +25,7 @@
  * 
  * @author jonas
  */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class EndOfLapSuppression extends TriggerSuppression {
 
     enum t_type {
@@ -41,18 +39,18 @@ enum t_type {
     public static final TriggerSuppression EndOfLapSuppression = new EndOfLapSuppression(
             t_type.t_EndOfLap);
 
-    t_type suppressionType = t_type.t_Interval;
-    double lapDuration = 0;
+    private t_type suppressionType = t_type.t_Interval;
+    private double lapDuration = 0;
 
-    static final double lapTimeLimit = 10; // seconds
-    static final double lapDistanceLimit = 5; // meters
+    private static final double lapTimeLimit = 10; // seconds
+    private static final double lapDistanceLimit = 5; // meters
 
-    static final double minTimeLimit = 3; // suppress Event.COMPLETED if lap/step is
+    private static final double minTimeLimit = 3; // suppress Event.COMPLETED if lap/step is
                                     // shorter than this
-    static final double minDistanceLimit = 3;// suppress Event.COMPLETED if lap/step
+    private static final double minDistanceLimit = 3;// suppress Event.COMPLETED if lap/step
                                        // is shorter than this
 
-    public EndOfLapSuppression(t_type type) {
+    private EndOfLapSuppression(t_type type) {
         suppressionType = type;
     }
 
@@ -88,14 +86,10 @@ private boolean suppressEmpty(Trigger trigger, Workout w) {
             return false;
         }
 
-        if (w.getTime(s) > minTimeLimit) {
-            return false;
-        }
-
-        return true;
+        return w.getTime(s) <= minTimeLimit;
     }
 
-    public boolean suppressInterval(Trigger trigger, Workout w) {
+    private boolean suppressInterval(Trigger trigger, Workout w) {
 
         if (!(trigger instanceof IntervalTrigger))
             return false;
diff --git a/app/src/org/runnerup/workout/Event.java b/app/src/org/runnerup/workout/Event.java
index 718f659b1..066a2f7da 100644
--- a/app/src/org/runnerup/workout/Event.java
+++ b/app/src/org/runnerup/workout/Event.java
@@ -33,7 +33,7 @@ public enum Event {
     int value = 0;
     final int cueId;
 
-    private Event(int val, int cueId) {
+    Event(int val, int cueId) {
         this.value = val;
         this.cueId = cueId;
     }
@@ -46,9 +46,7 @@ public int getValue() {
     }
 
     public boolean equal(Event what) {
-        if (what == null || what.value != this.value)
-            return false;
-        return true;
+        return !(what == null || what.value != this.value);
     }
 
     public int getCueId() {
diff --git a/app/src/org/runnerup/workout/EventTrigger.java b/app/src/org/runnerup/workout/EventTrigger.java
index e4df78bdb..76e190a78 100644
--- a/app/src/org/runnerup/workout/EventTrigger.java
+++ b/app/src/org/runnerup/workout/EventTrigger.java
@@ -17,15 +17,12 @@
 
 package org.runnerup.workout;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
 public class EventTrigger extends Trigger {
 
     Scope scope = Scope.STEP;
     Event event = Event.STARTED;
-    int counter = 0;
+    private int counter = 0;
     int skipCounter = 0;
     int maxCounter = Integer.MAX_VALUE;
 
@@ -40,7 +37,7 @@ public boolean onTick(Workout w) {
     }
 
     @Override
-    public void fire(Workout s) {
+    void fire(Workout s) {
         if (counter >= skipCounter && (counter < maxCounter)) {
             super.fire(s);
         }
diff --git a/app/src/org/runnerup/workout/Feedback.java b/app/src/org/runnerup/workout/Feedback.java
index 01ad6e3ec..daf798d36 100644
--- a/app/src/org/runnerup/workout/Feedback.java
+++ b/app/src/org/runnerup/workout/Feedback.java
@@ -17,15 +17,14 @@
 
 package org.runnerup.workout;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 
 import java.util.HashMap;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public abstract class Feedback {
 
+    @SuppressWarnings("EmptyMethod")
     public void onInit(Workout s) {
     }
 
diff --git a/app/src/org/runnerup/workout/HRMStateTrigger.java b/app/src/org/runnerup/workout/HRMStateTrigger.java
index 443be4e06..c00143e9a 100644
--- a/app/src/org/runnerup/workout/HRMStateTrigger.java
+++ b/app/src/org/runnerup/workout/HRMStateTrigger.java
@@ -1,7 +1,5 @@
 package org.runnerup.workout;
 
-import android.util.Log;
-
 import org.runnerup.hr.HRProvider;
 
 public class HRMStateTrigger extends Trigger {
diff --git a/app/src/org/runnerup/workout/IntervalTrigger.java b/app/src/org/runnerup/workout/IntervalTrigger.java
index 477db73ea..499523a96 100644
--- a/app/src/org/runnerup/workout/IntervalTrigger.java
+++ b/app/src/org/runnerup/workout/IntervalTrigger.java
@@ -17,10 +17,7 @@
 
 package org.runnerup.workout;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
 public class IntervalTrigger extends Trigger {
 
     Scope scope = Scope.ACTIVITY;
@@ -28,9 +25,8 @@ public class IntervalTrigger extends Trigger {
 
     double first = 120;
     double interval = 120;
-    final int count = 0; // endless
 
-    double next = 0;
+    private double next = 0;
 
     @Override
     public boolean onTick(Workout w) {
@@ -52,7 +48,8 @@ private void scheduleNext(Workout w, double now) {
             while (next <= now) {
                 next += interval;
             }
-            if (count != 0 && (next > (first + interval * (count - 1)))) {
+            int count = 0; //endless
+            if (/*count != 0 &&*/ (next > (first + interval * (count - 1)))) {
                 // no more occurrences
                 next = 0;
             }
diff --git a/app/src/org/runnerup/workout/ListTrigger.java b/app/src/org/runnerup/workout/ListTrigger.java
index 2c887cb86..75f4c0786 100644
--- a/app/src/org/runnerup/workout/ListTrigger.java
+++ b/app/src/org/runnerup/workout/ListTrigger.java
@@ -17,25 +17,22 @@
 
 package org.runnerup.workout;
 
-import android.annotation.TargetApi;
-import android.os.Build;
-
 import java.util.ArrayList;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class ListTrigger extends Trigger {
 
     boolean remaining = false;
     Scope scope = Scope.ACTIVITY;
     Dimension dimension = Dimension.TIME;
 
-    int pos = Integer.MAX_VALUE;
-    ArrayList<Double> triggerTimes = new ArrayList<Double>();
+    private int pos = Integer.MAX_VALUE;
+    ArrayList<Double> triggerTimes = new ArrayList<>();
 
     @Override
     public boolean onTick(Workout w) {
         if (pos < triggerTimes.size()) {
-            if (remaining == false) {
+            if (!remaining) {
                 double now = w.get(scope, dimension);
                 if (now >= triggerTimes.get(pos)) {
                     fire(w);
@@ -53,7 +50,7 @@ public boolean onTick(Workout w) {
     }
 
     private void scheduleNext(Workout w, double now) {
-        if (remaining == false) {
+        if (!remaining) {
             while (pos < triggerTimes.size() && now >= triggerTimes.get(pos)) {
                 pos++;
             }
diff --git a/app/src/org/runnerup/workout/PauseStep.java b/app/src/org/runnerup/workout/PauseStep.java
index 2e73b5d16..17a3d1417 100644
--- a/app/src/org/runnerup/workout/PauseStep.java
+++ b/app/src/org/runnerup/workout/PauseStep.java
@@ -17,19 +17,14 @@
 
 package org.runnerup.workout;
 
-import android.annotation.TargetApi;
-import android.os.Build;
-
 import org.runnerup.BuildConfig;
 
-import java.util.HashMap;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
 public class PauseStep extends Step {
 
-    long elapsedTime = 0;
-    long lastTime = 0;
-    double saveDurationValue = 0;
+    private long elapsedTime = 0;
+    private long lastTime = 0;
+    private double saveDurationValue = 0;
 
     @Override
     public void onInit(Workout s) {
@@ -38,11 +33,6 @@ public void onInit(Workout s) {
         saveDurationValue = super.durationValue;
     }
 
-    @Override
-    public void onBind(Workout s, HashMap<String, Object> bindValues) {
-        super.onBind(s, bindValues);
-    }
-
     @Override
     public void onStart(Scope what, Workout s) {
         if (what == Scope.STEP) {
@@ -71,7 +61,7 @@ private void sample(boolean paused) {
         lastTime = now;
         elapsedTime += diff;
         if (paused) {
-            /**
+            /*
              * to make sure that actual pause time is save...we increase the
              * durationValue every time elapsedTime is increased if we're
              * currently paused to handle repeats, this is later restored in
diff --git a/app/src/org/runnerup/workout/Range.java b/app/src/org/runnerup/workout/Range.java
index fbebea0b8..d14d6f478 100644
--- a/app/src/org/runnerup/workout/Range.java
+++ b/app/src/org/runnerup/workout/Range.java
@@ -17,10 +17,7 @@
 
 package org.runnerup.workout;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
 public class Range {
 
     public double minValue;
diff --git a/app/src/org/runnerup/workout/RepeatStep.java b/app/src/org/runnerup/workout/RepeatStep.java
index 38a2c44b7..355fcfbff 100644
--- a/app/src/org/runnerup/workout/RepeatStep.java
+++ b/app/src/org/runnerup/workout/RepeatStep.java
@@ -17,14 +17,11 @@
 
 package org.runnerup.workout;
 
-import android.annotation.TargetApi;
-import android.os.Build;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class RepeatStep extends Step {
 
     int repeatCount = 1;
@@ -33,10 +30,10 @@ public ArrayList<Step> getSteps() {
         return steps;
     }
 
-    final ArrayList<Step> steps = new ArrayList<Step>();
+    final ArrayList<Step> steps = new ArrayList<>();
 
-    int currentStep = 0;
-    int currentRepeat = 0;
+    private int currentStep = 0;
+    private int currentRepeat = 0;
 
     public RepeatStep() {
         this.intensity = Intensity.REPEAT;
@@ -105,10 +102,7 @@ public void onPause(Workout s) {
 
     @Override
     public boolean onTick(Workout w) {
-        if (steps.get(currentStep).onTick(w)) {
-            return true;
-        }
-        return false;
+        return steps.get(currentStep).onTick(w);
     }
 
     @Override
diff --git a/app/src/org/runnerup/workout/Scope.java b/app/src/org/runnerup/workout/Scope.java
index f77e44dcf..1cb1ef793 100644
--- a/app/src/org/runnerup/workout/Scope.java
+++ b/app/src/org/runnerup/workout/Scope.java
@@ -32,7 +32,7 @@ public enum Scope {
     int value = 0;
     int cueId = 0;
 
-    private Scope(int val, int cueId) {
+    Scope(int val, int cueId) {
         this.value = val;
         this.cueId = cueId;
     }
@@ -45,9 +45,7 @@ public int getValue() {
     }
 
     public boolean equal(Scope what) {
-        if (what == null || what.value != this.value)
-            return false;
-        return true;
+        return !(what == null || what.value != this.value);
     }
 
     public int getCueId() {
diff --git a/app/src/org/runnerup/workout/Step.java b/app/src/org/runnerup/workout/Step.java
index 7f5da2324..0912db3c2 100644
--- a/app/src/org/runnerup/workout/Step.java
+++ b/app/src/org/runnerup/workout/Step.java
@@ -17,9 +17,7 @@
 
 package org.runnerup.workout;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
-import android.os.Build;
 
 import org.runnerup.BuildConfig;
 import org.runnerup.common.util.Constants.DB;
@@ -28,10 +26,10 @@
 import java.util.HashMap;
 import java.util.List;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class Step implements TickComponent {
 
-    String name = null;
+    private String name = null;
 
     /**
      * Intensity
@@ -53,12 +51,12 @@ public class Step implements TickComponent {
     /**
      * Autolap (m)
      */
-    double autolap = 0;
+    private double autolap = 0;
 
     /**
      * Triggers
      */
-    final ArrayList<Trigger> triggers = new ArrayList<Trigger>();
+    final ArrayList<Trigger> triggers = new ArrayList<>();
 
     /**
      * @return the name
@@ -182,12 +180,12 @@ public void onRepeat(int current, int count) {
         }
     }
 
-    double stepStartTime = 0;
-    double stepStartDistance = 0;
-    double stepStartHeartbeats = 0;
-    double lapStartTime = 0;
-    double lapStartDistance = 0;
-    double lapStartHeartbeats = 0;
+    private double stepStartTime = 0;
+    private double stepStartDistance = 0;
+    private double stepStartHeartbeats = 0;
+    private double lapStartTime = 0;
+    private double lapStartDistance = 0;
+    private double lapStartHeartbeats = 0;
 
     @Override
     public void onStart(Scope what, Workout s) {
@@ -262,7 +260,7 @@ public void onStop(Workout s) {
             t.onStop(s);
         }
 
-        /**
+        /*
          * Save current lap so that it shows in DetailActivity
          */
         long distance = Math.round(s.getDistance(Scope.LAP));
@@ -273,7 +271,7 @@ public void onStop(Workout s) {
             tmp.put(DB.LAP.DISTANCE, distance);
             tmp.put(DB.LAP.TIME, time);
             tmp.put(DB.LAP.AVG_HR, Math.round(hr));
-            s.saveLap(tmp, /** next lap */
+            s.saveLap(tmp, /* next lap */
             false);
         }
     }
@@ -334,7 +332,7 @@ public void onComplete(Scope scope, Workout s) {
                 tmp.put(DB.LAP.DISTANCE, distance);
                 tmp.put(DB.LAP.TIME, time);
                 tmp.put(DB.LAP.AVG_HR, Math.round(hr));
-                s.saveLap(tmp, /** next lap */
+                s.saveLap(tmp, /* next lap */
                 true);
             }
         }
@@ -397,7 +395,7 @@ public double getDuration(Dimension dimension) {
     }
 
     public static Step createPauseStep(Dimension dim, double duration) {
-        Step step = null;
+        Step step;
         if (dim == null || dim == Dimension.TIME)
             step = new PauseStep();
         else
diff --git a/app/src/org/runnerup/workout/TargetTrigger.java b/app/src/org/runnerup/workout/TargetTrigger.java
index a46b7a026..14d780fbb 100644
--- a/app/src/org/runnerup/workout/TargetTrigger.java
+++ b/app/src/org/runnerup/workout/TargetTrigger.java
@@ -17,41 +17,41 @@
 
 package org.runnerup.workout;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 import android.util.Log;
 
 import org.runnerup.BuildConfig;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class TargetTrigger extends Trigger {
 
-    boolean inited = false;
-    boolean paused = false;
+    private boolean inited = false;
+    private boolean paused = false;
 
-    int graceCount = 30; //
-    final int initialGrace = 20;
-    int minGraceCount = 30; //
+    private int graceCount = 30; //
+    @SuppressWarnings("FieldCanBeLocal")
+    private final int initialGrace = 20;
+    private int minGraceCount = 30; //
 
     Scope scope = Scope.STEP;
-    Dimension dimension = Dimension.PACE;
+    private Dimension dimension = Dimension.PACE;
 
     Range range = null;
 
-    int cntMeasures = 0;
-    double measure[] = null;
-    int skip_values = 1;
-    double sort_measure[] = null;
-    double lastTimestamp = 0;
+    private int cntMeasures = 0;
+    private double[] measure = null;
+    @SuppressWarnings("FieldCanBeLocal")
+    private int skip_values = 1;
+    private double[] sort_measure = null;
+    private double lastTimestamp = 0;
 
-    double measure_time[] = null;
-    double measure_distance[] = null;
+    private double[] measure_time = null;
+    private double[] measure_distance = null;
 
     /**
      * cache computing of median
      */
-    double lastVal = 0;
-    int lastValCnt = 0;
+    private double lastVal = 0;
+    private int lastValCnt = 0;
 
     public TargetTrigger(Dimension dim, int movingAverageSeconds, int graceSeconds) {
         dimension = dim;
@@ -90,7 +90,7 @@ public boolean onTick(Workout w) {
             return false;
         }
 
-        if (inited == false) {
+        if (!inited) {
             Log.i(getClass().getName(), "inited == false");
             lastTimestamp = time_now;
             initMeasurement(w, time_now);
diff --git a/app/src/org/runnerup/workout/TickComponent.java b/app/src/org/runnerup/workout/TickComponent.java
index 2e6359d70..d909ed6ec 100644
--- a/app/src/org/runnerup/workout/TickComponent.java
+++ b/app/src/org/runnerup/workout/TickComponent.java
@@ -17,6 +17,6 @@
 
 package org.runnerup.workout;
 
-public interface TickComponent extends WorkoutComponent {
-    public boolean onTick(Workout w);
+interface TickComponent extends WorkoutComponent {
+    boolean onTick(Workout w);
 }
diff --git a/app/src/org/runnerup/workout/Trigger.java b/app/src/org/runnerup/workout/Trigger.java
index 0bd0d1a94..083e7bd61 100644
--- a/app/src/org/runnerup/workout/Trigger.java
+++ b/app/src/org/runnerup/workout/Trigger.java
@@ -17,18 +17,16 @@
 
 package org.runnerup.workout;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 import android.util.Log;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public abstract class Trigger implements TickComponent {
 
-    ArrayList<Feedback> triggerAction = new ArrayList<Feedback>();
-    final ArrayList<TriggerSuppression> triggerSuppression = new ArrayList<TriggerSuppression>();
+    ArrayList<Feedback> triggerAction = new ArrayList<>();
+    final ArrayList<TriggerSuppression> triggerSuppression = new ArrayList<>();
 
     @Override
     public void onInit(Workout s) {
@@ -51,7 +49,7 @@ public void onEnd(Workout s) {
         }
     }
 
-    public void fire(Workout w) {
+    void fire(Workout w) {
         for (TriggerSuppression s : triggerSuppression) {
             if (s.suppress(this, w)) {
                 Log.e(getClass().getName(), "trigger: " + this + "suppressed by: " + s);
diff --git a/app/src/org/runnerup/workout/TriggerSuppression.java b/app/src/org/runnerup/workout/TriggerSuppression.java
index f537a8f28..a2c7a8472 100644
--- a/app/src/org/runnerup/workout/TriggerSuppression.java
+++ b/app/src/org/runnerup/workout/TriggerSuppression.java
@@ -17,10 +17,7 @@
 
 package org.runnerup.workout;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
 public abstract class TriggerSuppression {
 
     public abstract boolean suppress(Trigger trigger, Workout w);
diff --git a/app/src/org/runnerup/workout/Workout.java b/app/src/org/runnerup/workout/Workout.java
index eed04f3c2..576a1f87f 100644
--- a/app/src/org/runnerup/workout/Workout.java
+++ b/app/src/org/runnerup/workout/Workout.java
@@ -17,11 +17,9 @@
 
 package org.runnerup.workout;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.content.SharedPreferences;
 import android.location.Location;
-import android.os.Build;
 
 import org.runnerup.BuildConfig;
 import org.runnerup.common.util.Constants;
@@ -44,22 +42,22 @@
  * RunActivity, and by the Workout components
  */
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class Workout implements WorkoutComponent, WorkoutInfo {
 
-    long lap = 0;
-    int currentStepNo = -1;
-    int workoutType = Constants.WORKOUT_TYPE.BASIC;
-    Step currentStep = null;
-    boolean paused = false;
-    final ArrayList<Step> steps = new ArrayList<Step>();
-    final ArrayList<WorkoutStepListener> stepListeners = new ArrayList<WorkoutStepListener>();
+    private long lap = 0;
+    private int currentStepNo = -1;
+    private int workoutType = Constants.WORKOUT_TYPE.BASIC;
+    private Step currentStep = null;
+    private boolean paused = false;
+    final ArrayList<Step> steps = new ArrayList<>();
+    private final ArrayList<WorkoutStepListener> stepListeners = new ArrayList<>();
     int sport = DB.ACTIVITY.SPORT_RUNNING;
     private boolean mute;
 
     class PendingFeedback {
         int depth = 0;
-        final HashSet<Feedback> set = new HashSet<Feedback>(); // For uniquing
+        final HashSet<Feedback> set = new HashSet<>(); // For uniquing
 
         void init() {
             depth++;
@@ -78,6 +76,7 @@ void add(Feedback f) {
             }
         }
 
+        @SuppressWarnings("UnusedReturnValue")
         boolean end() {
             --depth;
             if (depth == 0) {
@@ -94,12 +93,12 @@ boolean end() {
         }
     }
 
-    final PendingFeedback pendingFeedback = new PendingFeedback();
+    private final PendingFeedback pendingFeedback = new PendingFeedback();
 
     Tracker tracker = null;
     SharedPreferences audioCuePrefs;
-    HRZones hrZones = null;
-    RUTextToSpeech textToSpeech = null;
+    private HRZones hrZones = null;
+    private RUTextToSpeech textToSpeech = null;
 
     public static final String KEY_TTS = "tts";
     public static final String KEY_COUNTER_VIEW = "CountdownView";
@@ -181,7 +180,7 @@ public void onTick() {
 
         while (currentStep != null) {
             boolean finished = currentStep.onTick(this);
-            if (finished == false)
+            if (!finished)
                 break;
 
             onNextStep();
@@ -566,7 +565,7 @@ public boolean isLastStep() {
     }
 
     /**
-     * @return flattened list of all steps in workout
+     * flattened list of all steps in workout
      */
     static public class StepListEntry {
         public StepListEntry(int index, Step step, int level, Step parent) {
@@ -591,7 +590,7 @@ public List<Step> getSteps() {
     }
 
     public List<StepListEntry> getStepList() {
-        ArrayList<StepListEntry> list = new ArrayList<StepListEntry>();
+        ArrayList<StepListEntry> list = new ArrayList<>();
         for (Step s : steps) {
             s.getSteps(null, 0, list);
         }
@@ -642,9 +641,9 @@ public double getTime(Scope scope) {
                 case ACTIVITY:
                     return (10 * 60 + 50 * 60 * Math.random());
                 case STEP:
-                    return (1 * 60 + 5 * 60 * Math.random());
+                    return (/* 1* */ 60 + 5 * 60 * Math.random());
                 case LAP:
-                    return (1 * 60 + 5 * 60 * Math.random());
+                    return (/* 1* */ 60 + 5 * 60 * Math.random());
                 case CURRENT:
                     return System.currentTimeMillis() / 1000;
             }
@@ -670,8 +669,7 @@ public Location getLastKnownLocation() {
     }
 
     public static Workout fakeWorkoutForTestingAudioCue() {
-        FakeWorkout w = new FakeWorkout();
-        return w;
+        return new FakeWorkout();
     }
 
     public void setMute(boolean mute) {
diff --git a/app/src/org/runnerup/workout/WorkoutBuilder.java b/app/src/org/runnerup/workout/WorkoutBuilder.java
index 559f9b000..9291ff1bb 100644
--- a/app/src/org/runnerup/workout/WorkoutBuilder.java
+++ b/app/src/org/runnerup/workout/WorkoutBuilder.java
@@ -17,11 +17,9 @@
 
 package org.runnerup.workout;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
-import android.os.Build;
 import android.text.format.DateUtils;
 import android.util.Log;
 import android.util.Pair;
@@ -43,7 +41,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class WorkoutBuilder {
 
     /**
@@ -103,7 +101,7 @@ public static Workout createDefaultWorkout(Resources res, SharedPreferences pref
                 }
             }
         }
-        /**
+        /*
 		 *
 		 */
         return w;
@@ -140,6 +138,7 @@ public static Workout createDefaultIntervalWorkout(Resources res, SharedPreferen
         final boolean convertRestToRecovery = prefs.getBoolean(res.getString(
                 R.string.pref_convert_interval_distance_rest_to_recovery), true);
 
+        //noinspection ConstantConditions
         if (warmup) {
             Step step = new Step();
             step.intensity = Intensity.WARMUP;
@@ -178,15 +177,14 @@ public static Workout createDefaultIntervalWorkout(Resources res, SharedPreferen
             }
             repeat.steps.add(step);
 
-            //noinspection ConstantIfStatement
-            if (true) {
+            //if (true) {
                 Step rest = null;
                 switch (intervalRestType) {
                     case 0: // Time
                         rest = Step.createPauseStep(Dimension.TIME, intervalRestTime);
                         break;
                     case 1: // Distance
-                        if (convertRestToRecovery == false) {
+                        if (!convertRestToRecovery) {
                             rest = Step.createPauseStep(Dimension.DISTANCE, intevalRestDistance);
                         } else {
                             rest = new Step();
@@ -197,10 +195,11 @@ public static Workout createDefaultIntervalWorkout(Resources res, SharedPreferen
                         break;
                 }
                 repeat.steps.add(rest);
-            }
+            //}
         }
         w.steps.add(repeat);
 
+        //noinspection ConstantConditions
         if (cooldown) {
             Step step = new Step();
             step.intensity = Intensity.COOLDOWN;
@@ -216,9 +215,7 @@ public static boolean validateSeconds(String newValue) {
         // TODO move this somewhere
         long seconds = SafeParse.parseSeconds(newValue, -1);
         long seconds2 = SafeParse.parseSeconds(DateUtils.formatElapsedTime(seconds), -1);
-        if (seconds == seconds2)
-            return true;
-        return false;
+        return seconds == seconds2;
     }
 
     public static SharedPreferences getAudioCuePreferences(Context ctx, SharedPreferences pref,
@@ -228,8 +225,8 @@ public static SharedPreferences getAudioCuePreferences(Context ctx, SharedPrefer
                 AudioCueSettingsActivity.SUFFIX);
     }
 
-    public static SharedPreferences getSubPreferences(Context ctx, SharedPreferences pref,
-            String key, String defaultVal, String suffix) {
+    private static SharedPreferences getSubPreferences(Context ctx, SharedPreferences pref,
+                                                       String key, String defaultVal, String suffix) {
         String name = pref.getString(key, null);
         if (name == null || name.contentEquals(defaultVal)) {
             return pref;
@@ -306,12 +303,12 @@ private static void addAudioCuesToWorkout(Resources res, ArrayList<Step> steps,
 
                         Trigger elt = hasEndOfLapTrigger(triggers);
                         if (elt != null) {
-                            /** Add feedback after "end of lap" */
+                            /* Add feedback after "end of lap" */
                             ev.triggerAction.addAll(elt.triggerAction);
-                            /** suppress empty STEP COMPLETED */
+                            /* suppress empty STEP COMPLETED */
                             ev.triggerSuppression.add(EndOfLapSuppression.EmptyLapSuppression);
 
-                            /** And suppress last end of lap trigger */
+                            /* And suppress last end of lap trigger */
                             elt.triggerSuppression.add(EndOfLapSuppression.EndOfLapSuppression);
                         }
                     }
@@ -346,7 +343,7 @@ private static void addAudioCuesToWorkout(Resources res, ArrayList<Step> steps,
                 case WARMUP:
                 case COOLDOWN:
                     addPauseStopResumeTriggers(res, step.triggers, prefs);
-                    if (skip_startstop_cue == false) {
+                    if (!skip_startstop_cue) {
                         EventTrigger ev = new EventTrigger();
                         ev.event = Event.STARTED;
                         ev.scope = Scope.STEP;
@@ -406,7 +403,7 @@ public boolean match(Trigger trigger) {
     private static void checkDuplicateTriggers(Step step) {
         if (hasEndOfLapTrigger(step.triggers) != null) {
             Log.e("WorkoutBuilder", "hasEndOfLapTrigger()");
-            /**
+            /*
              * The end of lap trigger can be a duplicate of a distance based
              * interval trigger 1) in a step with distance duration, that is a
              * multiple of the interval-distance e.g interval-trigger-distance =
@@ -414,7 +411,7 @@ private static void checkDuplicateTriggers(Step step) {
              * autolap 500m and interval-trigger-distance 1000 then remove the
              * trigger
              */
-            ArrayList<TriggerSuppression> list = new ArrayList<TriggerSuppression>();
+            ArrayList<TriggerSuppression> list = new ArrayList<>();
             if (step.getAutolap() > 0) {
                 list.add(new EndOfLapSuppression(step.getAutolap()));
             }
@@ -434,8 +431,8 @@ private static void checkDuplicateTriggers(Step step) {
     }
 
     private static ArrayList<Trigger> createDefaultTriggers(Resources res, SharedPreferences prefs) {
-        ArrayList<Feedback> feedback = new ArrayList<Feedback>();
-        ArrayList<Trigger> triggers = new ArrayList<Trigger>();
+        ArrayList<Feedback> feedback = new ArrayList<>();
+        ArrayList<Trigger> triggers = new ArrayList<>();
 
         if (prefs.getBoolean(res.getString(R.string.cue_time), false)) {
             long val = 0;
@@ -482,7 +479,7 @@ private static ArrayList<Trigger> createDefaultTriggers(Resources res, SharedPre
 
         for (Trigger t : triggers) {
             t.triggerAction = feedback;
-            /** suppress empty laps */
+            /* suppress empty laps */
             t.triggerSuppression.add(EndOfLapSuppression.EmptyLapSuppression);
         }
 
@@ -491,7 +488,7 @@ private static ArrayList<Trigger> createDefaultTriggers(Resources res, SharedPre
 
     private static void addPauseStopResumeTriggers(Resources res, ArrayList<Trigger> list,
             SharedPreferences prefs) {
-        if (prefs.getBoolean(res.getString(R.string.cueinfo_skip_startstop), false) == false) {
+        if (!prefs.getBoolean(res.getString(R.string.cueinfo_skip_startstop), false)) {
             {
                 EventTrigger p = new EventTrigger();
                 p.event = Event.PAUSED;
@@ -523,8 +520,8 @@ private static void createAudioCountdown(Step step) {
             return;
         }
 
-        double first = 0;
-        ArrayList<Double> list = new ArrayList<Double>();
+        double first;
+        ArrayList<Double> list = new ArrayList<>();
         switch (step.getDurationType()) {
             case TIME:
                 first = 60; // 1 minute
@@ -545,7 +542,7 @@ private static void createAudioCountdown(Step step) {
         }
 
         if (step.getDurationValue() > first) {
-            /**
+            /*
              * If longer than limit...create a Interval trigger for ">" part
              */
             IntervalTrigger trigger = new IntervalTrigger();
@@ -558,10 +555,10 @@ private static void createAudioCountdown(Step step) {
             step.triggers.add(trigger);
         }
 
-        /**
+        /*
          * Then create a list trigger for reminder...
          */
-        ArrayList<Double> triggerTimes = new ArrayList<Double>();
+        ArrayList<Double> triggerTimes = new ArrayList<>();
         for (Double d : list) {
             if (d >= step.getDurationValue())
                 continue;
@@ -584,27 +581,26 @@ private static void createAudioCountdown(Step step) {
             step.triggers.add(trigger);
         }
 
-        if (true) {
-            /**
-             * Add add information just when pause step starts...
-             */
-            EventTrigger ev = new EventTrigger();
-            ev.event = Event.STARTED;
-            ev.scope = Scope.STEP;
-            ev.triggerAction.add(new AudioCountdownFeedback(Scope.STEP, step.getDurationType()));
-            step.triggers.add(ev);
-        }
+
+        /*
+         * Add add information just when pause step starts...
+         */
+        EventTrigger ev = new EventTrigger();
+        ev.event = Event.STARTED;
+        ev.scope = Scope.STEP;
+        ev.triggerAction.add(new AudioCountdownFeedback(Scope.STEP, step.getDurationType()));
+        step.triggers.add(ev);
     }
 
     public static void prepareWorkout(Resources res, SharedPreferences prefs, Workout w,
             boolean basic) {
         List<StepListEntry> steps = w.getStepList();
 
-        /**
+        /*
          * Add/remove autolap
          */
         boolean autolap = prefs.getBoolean(res.getString(R.string.pref_autolap_active), false);
-        if (basic == false) {
+        if (!basic) {
             autolap = prefs.getBoolean(res.getString(R.string.pref_step_autolap_active), autolap);
         }
         if (autolap) {
@@ -631,7 +627,7 @@ public static void prepareWorkout(Resources res, SharedPreferences prefs, Workou
             }
         }
 
-        /**
+        /*
          * Add countdowns after steps with duration "until pressed"
          * - if next is not a countdown
          * - and current is not rest
@@ -683,7 +679,7 @@ public static void prepareWorkout(Resources res, SharedPreferences prefs, Workou
     public static void addFeedbackFromPreferences(SharedPreferences prefs,
             Resources res, ArrayList<Feedback> feedback) {
 
-        /**** TOTAL ****/
+        /* TOTAL */
         if (prefs.getBoolean(res.getString(R.string.cueinfo_total_distance), false)) {
             feedback.add(new AudioFeedback(Scope.ACTIVITY, Dimension.DISTANCE));
         }
@@ -704,7 +700,7 @@ public static void addFeedbackFromPreferences(SharedPreferences prefs,
             feedback.add(new AudioFeedback(Scope.ACTIVITY, Dimension.HRZ));
         }
 
-        /**** STEP ****/
+        /* STEP */
         if (prefs.getBoolean(res.getString(R.string.cueinfo_step_distance), false)) {
             feedback.add(new AudioFeedback(Scope.STEP, Dimension.DISTANCE));
         }
@@ -725,7 +721,7 @@ public static void addFeedbackFromPreferences(SharedPreferences prefs,
             feedback.add(new AudioFeedback(Scope.STEP, Dimension.HRZ));
         }
 
-        /**** LAP ****/
+        /* LAP */
         if (prefs.getBoolean(res.getString(R.string.cueinfo_lap_distance), false)) {
             feedback.add(new AudioFeedback(Scope.LAP, Dimension.DISTANCE));
         }
@@ -746,7 +742,7 @@ public static void addFeedbackFromPreferences(SharedPreferences prefs,
             feedback.add(new AudioFeedback(Scope.LAP, Dimension.HRZ));
         }
 
-        /**** CURRENT ****/
+        /* CURRENT */
         if (prefs.getBoolean(res.getString(R.string.cueinfo_current_pace), false)) {
             feedback.add(new AudioFeedback(Scope.CURRENT, Dimension.PACE));
         }
diff --git a/app/src/org/runnerup/workout/WorkoutComponent.java b/app/src/org/runnerup/workout/WorkoutComponent.java
index dd1f649a5..c080b1f42 100644
--- a/app/src/org/runnerup/workout/WorkoutComponent.java
+++ b/app/src/org/runnerup/workout/WorkoutComponent.java
@@ -19,52 +19,52 @@
 
 import java.util.HashMap;
 
-public interface WorkoutComponent {
+interface WorkoutComponent {
     /**
      * Called before workout begins
      */
-    public void onInit(Workout s);
+    void onInit(Workout s);
 
     /**
      * Called at least once before onStart Can be called later if orientation
      * changes
      */
-    public void onBind(Workout s, HashMap<String, Object> bindValues);
+    void onBind(Workout s, HashMap<String, Object> bindValues);
 
     /**
      * Called before onStart
      */
-    public void onRepeat(int current, int limit);
+    void onRepeat(int current, int limit);
 
     /**
      * Called when *what* starts
      */
-    public void onStart(Scope what, Workout s);
+    void onStart(Scope what, Workout s);
 
     /**
      * Called when user press PauseButton after this either onResume or
      * onComplete will be called
      */
-    public void onPause(Workout s);
+    void onPause(Workout s);
 
     /**
      * Called when user press StopButton after this either onResume or
      * onComplete will be called
      */
-    public void onStop(Workout s);
+    void onStop(Workout s);
 
     /**
      * Called when user press ResumeButton
      */
-    public void onResume(Workout s);
+    void onResume(Workout s);
 
     /**
      * Called when *what* is completed
      */
-    public void onComplete(Scope what, Workout s);
+    void onComplete(Scope what, Workout s);
 
     /**
      * Called after workout has ended
      */
-    public void onEnd(Workout s);
+    void onEnd(Workout s);
 }
diff --git a/app/src/org/runnerup/workout/WorkoutInfo.java b/app/src/org/runnerup/workout/WorkoutInfo.java
index 0380c9505..34b42cc9e 100644
--- a/app/src/org/runnerup/workout/WorkoutInfo.java
+++ b/app/src/org/runnerup/workout/WorkoutInfo.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (C) 2014 niklas.weidemann
+ *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
@@ -16,9 +18,6 @@
 
 import android.location.Location;
 
-/**
- * Created by niklas.weidemann on 2014-11-14.
- */
 public interface WorkoutInfo {
     double get(Scope scope, Dimension d);
 
diff --git a/app/src/org/runnerup/workout/WorkoutSerializer.java b/app/src/org/runnerup/workout/WorkoutSerializer.java
index faac88f96..4783eedd7 100644
--- a/app/src/org/runnerup/workout/WorkoutSerializer.java
+++ b/app/src/org/runnerup/workout/WorkoutSerializer.java
@@ -17,10 +17,8 @@
 
 package org.runnerup.workout;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.os.Build;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.util.Pair;
@@ -44,7 +42,7 @@
 import java.util.Comparator;
 import java.util.Stack;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class WorkoutSerializer {
 
     public static final String WORKOUTS_DIR = "workouts";
@@ -80,8 +78,8 @@ public static Workout readJSON(Reader in, boolean convertRestToRecovery) throws
         Workout w = new Workout();
         JSONArray steps = obj.getJSONArray("workoutSteps");
         int stepNo = 0;
-        JSONObject step = null;
-        ArrayList<jsonstep> list = new ArrayList<jsonstep>(4);
+        JSONObject step;
+        ArrayList<jsonstep> list = new ArrayList<>(4);
         while ((step = steps.optJSONObject(stepNo)) != null)
         {
             jsonstep js = parseStep(step, convertRestToRecovery);
@@ -92,7 +90,6 @@ public static Workout readJSON(Reader in, boolean convertRestToRecovery) throws
         for (jsonstep s : list) {
             if (s.parentGroup != null) {
                 s.parentStep = findRepeatStep(list, s.parentGroup);
-            } else {
             }
         }
 
@@ -168,12 +165,13 @@ private static void putIntensity(JSONObject obj, Intensity intensity) throws JSO
                 val = "recovery";
                 break;
         }
+        //noinspection ConstantConditions
         if (val != null) {
             obj.put("stepTypeKey", val);
         }
     }
 
-    private static final Pair<Dimension, Double> NullDimensionPair = new Pair<Dimension, Double>(null,
+    private static final Pair<Dimension, Double> NullDimensionPair = new Pair<>(null,
             0.0);
 
     private static Pair<Dimension, Double> getDuration(JSONObject obj, Intensity intensity)
@@ -201,7 +199,7 @@ private static Pair<Dimension, Double> getDuration(JSONObject obj, Intensity int
             return NullDimensionPair;
         }
 
-        return new Pair<Dimension, Double>(dim, val);
+        return new Pair<>(dim, val);
     }
 
     private static void putDuration(JSONObject obj, Step step, Dimension durationType,
@@ -250,7 +248,7 @@ private static double scale(double val, JSONObject obj, String key) {
         if (unit.equalsIgnoreCase("dimensionless"))
             return val;
 
-        /**
+        /*
          * The below are one I found in the json objects...
          */
         if (unit.equalsIgnoreCase("centimeter"))
@@ -262,7 +260,7 @@ private static double scale(double val, JSONObject obj, String key) {
         if (unit.equalsIgnoreCase("bpm"))
             return val;
 
-        /**
+        /*
          * The below I just added for "completeness"
          */
         if (unit.equalsIgnoreCase("millimeter"))
@@ -275,7 +273,7 @@ private static double scale(double val, JSONObject obj, String key) {
         return val;
     }
 
-    private static final Pair<Dimension, Range> NullTargetPair = new Pair<Dimension, Range>(null, null);
+    private static final Pair<Dimension, Range> NullTargetPair = new Pair<>(null, null);
 
     private static Pair<Dimension, Range> getTarget(JSONObject obj) {
         String targetTypeKey = getString(obj, "targetTypeKey");
@@ -306,7 +304,7 @@ private static Pair<Dimension, Range> getTarget(JSONObject obj) {
             return NullTargetPair;
         }
 
-        return new Pair<Dimension, Range>(dim, range);
+        return new Pair<>(dim, range);
     }
 
     private static void putTarget(JSONObject obj, Step step, Dimension targetType, Range targetValue) throws JSONException {
@@ -363,19 +361,19 @@ private static void scale(Range range, Dimension dim, JSONObject obj, String key
 
         double factor = 1.0;
         Dimension unitDim = dim;
-        /**
+        /*
          * The below are one I found in the json objects...
          */
         if (unit.equalsIgnoreCase("centimetersPerMillisecond")) {
             factor = 1000.0 / 100.0;
             unitDim = Dimension.SPEED;
-        } else if (unit.equalsIgnoreCase("stepsPerMinute")) {
-            // not implemented
-        } else if (unit.equalsIgnoreCase("bpm")) {
-            // not implemented
+        //} else if (unit.equalsIgnoreCase("stepsPerMinute")) {
+        //    // not implemented
+        //} else if (unit.equalsIgnoreCase("bpm")) {
+        //    // not implemented
         }
 
-        /**
+        /*
          * The below I just added for "completeness"
          */
         else if (unit.equalsIgnoreCase("metersPerMillisecond")) {
@@ -434,10 +432,8 @@ private static jsonstep parseStep(JSONObject obj, boolean convertRestToRecovery)
                 break;
             }
             case RESTING:
-                if (convertRestToRecovery && duration.first == Dimension.DISTANCE &&
-                        duration.second != null) {
-                    // fall through
-                } else {
+                if (!convertRestToRecovery || duration.first != Dimension.DISTANCE ||
+                        duration.second == null) {
                     js.step = Step.createPauseStep(duration.first, duration.second);
                     break;
                 }
@@ -479,15 +475,15 @@ public static void writeFile(Context ctx, String name, Workout workout) throws I
         writeJSON(new FileWriter(fout), workout);
     }
 
-    public static void writeJSON(Writer out, Workout workout) throws JSONException, IOException {
+    private static void writeJSON(Writer out, Workout workout) throws JSONException, IOException {
         JSONObject obj = createJSON(workout);
         out.write(obj.toString());
         out.flush();
     }
 
-    public static JSONObject createJSON(Workout workout) throws JSONException {
-        Stack<jsonstep> stepStack = new Stack<jsonstep>();
-        ArrayList<jsonstep> stepList = new ArrayList<jsonstep>();
+    private static JSONObject createJSON(Workout workout) throws JSONException {
+        Stack<jsonstep> stepStack = new Stack<>();
+        ArrayList<jsonstep> stepList = new ArrayList<>();
         int no = 1;
         int group = 1;
         Workout.StepListEntry prev = null;
diff --git a/app/src/org/runnerup/workout/WorkoutStepListener.java b/app/src/org/runnerup/workout/WorkoutStepListener.java
index b313a7d05..f4cd7c1f8 100644
--- a/app/src/org/runnerup/workout/WorkoutStepListener.java
+++ b/app/src/org/runnerup/workout/WorkoutStepListener.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (C) 2014 niklas.weidemann
+ *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
@@ -14,9 +16,6 @@
  */
 package org.runnerup.workout;
 
-/**
- * Created by jonas on 12/28/14.
- */
 public interface WorkoutStepListener {
-    public void onStepChanged(Step oldStep, Step newStep);
+    void onStepChanged(Step oldStep, Step newStep);
 }
diff --git a/app/src/org/runnerup/workout/feedback/AudioCountdownFeedback.java b/app/src/org/runnerup/workout/feedback/AudioCountdownFeedback.java
index b678debfb..0f58b591b 100644
--- a/app/src/org/runnerup/workout/feedback/AudioCountdownFeedback.java
+++ b/app/src/org/runnerup/workout/feedback/AudioCountdownFeedback.java
@@ -17,9 +17,7 @@
 
 package org.runnerup.workout.feedback;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.speech.tts.TextToSpeech;
 
 import org.runnerup.util.Formatter;
@@ -30,14 +28,14 @@
 
 import java.util.HashMap;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class AudioCountdownFeedback extends Feedback {
 
     boolean emitScope = false;
-    Scope scope = Scope.STEP;
-    Dimension dimension = Dimension.TIME;
-    RUTextToSpeech textToSpeech;
-    Formatter formatter;
+    private Scope scope = Scope.STEP;
+    private Dimension dimension = Dimension.TIME;
+    private RUTextToSpeech textToSpeech;
+    private Formatter formatter;
 
     public AudioCountdownFeedback(Scope s, Dimension d) {
         this.scope = s;
@@ -63,10 +61,7 @@ public boolean equals(Feedback _other) {
         if (scope != other.scope)
             return false;
 
-        if (dimension != other.dimension)
-            return false;
-
-        return true;
+        return dimension == other.dimension;
     }
 
     @Override
diff --git a/app/src/org/runnerup/workout/feedback/AudioFeedback.java b/app/src/org/runnerup/workout/feedback/AudioFeedback.java
index ad4044a3d..19f9a644c 100644
--- a/app/src/org/runnerup/workout/feedback/AudioFeedback.java
+++ b/app/src/org/runnerup/workout/feedback/AudioFeedback.java
@@ -17,9 +17,7 @@
 
 package org.runnerup.workout.feedback;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.speech.tts.TextToSpeech;
 
 import org.runnerup.util.Formatter;
@@ -32,15 +30,15 @@
 
 import java.util.HashMap;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class AudioFeedback extends Feedback {
 
-    int msgId = 0;
-    String msgTxt = null;
-    Event event = Event.STARTED;
+    private int msgId = 0;
+    private String msgTxt = null;
+    private Event event = Event.STARTED;
     Scope scope = Scope.ACTIVITY;
     Dimension dimension = Dimension.DISTANCE;
-    Intensity intensity = null;
+    private Intensity intensity = null;
     RUTextToSpeech textToSpeech;
     Formatter formatter;
 
@@ -92,13 +90,10 @@ public boolean equals(Feedback _other) {
         if (this.event != other.event)
             return false;
 
-        if (this.dimension != other.dimension)
-            return false;
-
-        return true;
+        return this.dimension == other.dimension;
     }
 
-    protected String getCue(Workout w, Context ctx) {
+    String getCue(Workout w, Context ctx) {
         String msg = null;
         if (msgId != 0) {
             if (msgTxt == null) {
diff --git a/app/src/org/runnerup/workout/feedback/CoachFeedback.java b/app/src/org/runnerup/workout/feedback/CoachFeedback.java
index 044142277..fa1367df1 100644
--- a/app/src/org/runnerup/workout/feedback/CoachFeedback.java
+++ b/app/src/org/runnerup/workout/feedback/CoachFeedback.java
@@ -17,9 +17,7 @@
 
 package org.runnerup.workout.feedback;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.speech.tts.TextToSpeech;
 
 import org.runnerup.R;
@@ -31,12 +29,12 @@
 import org.runnerup.workout.TargetTrigger;
 import org.runnerup.workout.Workout;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class CoachFeedback extends AudioFeedback {
 
-    int sign = 1;
-    Range range = null;
-    TargetTrigger trigger = null;
+    private int sign = 1;
+    private Range range = null;
+    private TargetTrigger trigger = null;
 
     public CoachFeedback(Scope scope, Dimension dimension, Range range, TargetTrigger trigger) {
         super(scope, dimension);
@@ -72,10 +70,7 @@ public boolean equals(Feedback _other) {
         if (!dimension.equal(other.dimension))
             return false;
 
-        if (!scope.equal(other.scope))
-            return false;
-
-        return true;
+        return scope.equal(other.scope);
     }
 
     @Override
diff --git a/app/src/org/runnerup/workout/feedback/CountdownFeedback.java b/app/src/org/runnerup/workout/feedback/CountdownFeedback.java
index 5ff471b73..ac680105b 100644
--- a/app/src/org/runnerup/workout/feedback/CountdownFeedback.java
+++ b/app/src/org/runnerup/workout/feedback/CountdownFeedback.java
@@ -17,9 +17,7 @@
 
 package org.runnerup.workout.feedback;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.view.View;
 import android.widget.TextView;
 
@@ -31,13 +29,13 @@
 
 import java.util.HashMap;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class CountdownFeedback extends Feedback {
 
-    Scope scope = Scope.STEP;
-    Dimension dimension = Dimension.TIME;
-    TextView textView = null;
-    Formatter formatter;
+    private Scope scope = Scope.STEP;
+    private Dimension dimension = Dimension.TIME;
+    private TextView textView = null;
+    private Formatter formatter;
 
     public CountdownFeedback(Scope s, Dimension d) {
         this.scope = s;
@@ -69,10 +67,7 @@ public void onEnd(Workout s) {
 
     @Override
     public boolean equals(Feedback _other) {
-        if (!(_other instanceof CountdownFeedback))
-            return false;
-
-        return true;
+        return _other instanceof CountdownFeedback;
     }
 
     @Override
diff --git a/app/src/org/runnerup/workout/feedback/HRMStateChangeFeedback.java b/app/src/org/runnerup/workout/feedback/HRMStateChangeFeedback.java
index d19040b6a..c275b7f52 100644
--- a/app/src/org/runnerup/workout/feedback/HRMStateChangeFeedback.java
+++ b/app/src/org/runnerup/workout/feedback/HRMStateChangeFeedback.java
@@ -13,9 +13,8 @@ public HRMStateChangeFeedback(HRMStateTrigger trigger) {
     }
 
     protected String getCue(Workout w, Context ctx) {
-        String cue =  ctx.getResources().getString((w.getHeartRate(Scope.CURRENT) == 0)
+        return (ctx.getResources().getString((w.getHeartRate(Scope.CURRENT) == 0)
                 ? R.string.cue_hrm_connection_lost
-                : R.string.cue_hrm_connection_restored);
-        return (cue);
+                : R.string.cue_hrm_connection_restored));
     }
 }
diff --git a/app/src/org/runnerup/workout/feedback/RUTextToSpeech.java b/app/src/org/runnerup/workout/feedback/RUTextToSpeech.java
index 896259457..f40a1c320 100644
--- a/app/src/org/runnerup/workout/feedback/RUTextToSpeech.java
+++ b/app/src/org/runnerup/workout/feedback/RUTextToSpeech.java
@@ -17,6 +17,7 @@
 
 package org.runnerup.workout.feedback;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.media.AudioManager;
@@ -32,15 +33,14 @@
 import java.util.HashSet;
 import java.util.Locale;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class RUTextToSpeech {
 
     private static final String UTTERANCE_ID = "RUTextTospeech";
-    boolean mute = false;
-    final boolean trace = true;
-    final TextToSpeech textToSpeech;
-    final AudioManager audioManager;
-    long id = (long) (System.nanoTime() + (1000 * Math.random()));
+    private boolean mute = false;
+    private final TextToSpeech textToSpeech;
+    private final AudioManager audioManager;
+    private long id = (long) (System.nanoTime() + (1000 * Math.random()));
 
     class Entry {
         final String text;
@@ -52,8 +52,8 @@ public Entry(String text, HashMap<String, String> params) {
         }
     }
 
-    final HashSet<String> cueSet = new HashSet<String>();
-    final ArrayList<Entry> cueList = new ArrayList<Entry>();
+    private final HashSet<String> cueSet = new HashSet<>();
+    private final ArrayList<Entry> cueList = new ArrayList<>();
 
     public RUTextToSpeech(TextToSpeech tts, boolean mute_, Context context) {
         this.textToSpeech = tts;
@@ -90,9 +90,12 @@ private String getId(String text) {
         return UTTERANCE_ID + Long.toString(val);
     }
 
+    @SuppressWarnings("UnusedReturnValue")
     int speak(String text, int queueMode, HashMap<String, String> params) {
 
+        final boolean trace = true;
         if (queueMode == TextToSpeech.QUEUE_FLUSH) {
+            //noinspection ConstantConditions
             if (trace) {
                 Log.e(getClass().getName(), "speak (mute: " + mute + "): " + text);
             }
@@ -104,12 +107,14 @@ int speak(String text, int queueMode, HashMap<String, String> params) {
             }
         } else {
             if (!cueSet.contains(text)) {
+                //noinspection ConstantConditions
                 if (trace) {
                     Log.e(getClass().getName(), "buffer speak: " + text);
                 }
                 cueSet.add(text);
                 cueList.add(new Entry(text, params));
             } else {
+                //noinspection ConstantConditions
                 if (trace) {
                     Log.e(getClass().getName(), "skip buffer (duplicate) speak: " + text);
                 }
@@ -134,7 +139,7 @@ private int speakWithMute(String text, int queueMode,
             outstanding.add(utId);
 
             if (params == null) {
-                params = new HashMap<String, String>();
+                params = new HashMap<>();
             }
             params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, utId);
             int res = textToSpeech.speak(text, queueMode, params);
@@ -150,7 +155,7 @@ private int speakWithMute(String text, int queueMode,
         return TextToSpeech.ERROR;
     }
 
-    final HashSet<String> outstanding = new HashSet<String>();
+    private final HashSet<String> outstanding = new HashSet<>();
 
     void utteranceCompleted(String id) {
         outstanding.remove(id);
@@ -160,8 +165,7 @@ void utteranceCompleted(String id) {
     }
 
     private boolean requestFocus() {
-        final AudioManager am = audioManager;
-        int result = am.requestAudioFocus(
+        int result = audioManager.requestAudioFocus(
                 null,// afChangeListener,
                 AudioManager.STREAM_MUSIC,
                 AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
@@ -172,14 +176,14 @@ public void emit() {
         if (cueSet.isEmpty()) {
             return;
         }
-        if (mute && requestFocus() == true) {
+        if (mute && requestFocus()) {
             for (Entry e : cueList) {
                 final String utId = getId(e.text);
                 outstanding.add(utId);
 
                 HashMap<String, String> params = e.params;
                 if (params == null) {
-                    params = new HashMap<String, String>();
+                    params = new HashMap<>();
                 }
                 params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, utId);
                 int res = textToSpeech.speak(e.text, TextToSpeech.QUEUE_ADD, params);
@@ -202,16 +206,16 @@ public void emit() {
     }
 }
 
-// separate class to handle FROYO/deprecation
-@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
+//Explicit check for Android 4.3
+@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
 class UtteranceCompletion {
 
+    @SuppressLint("ObsoleteSdkInt")
     @SuppressWarnings("deprecation")
     public static void setUtteranceCompletedListener(
             TextToSpeech tts, final RUTextToSpeech ruTextToSpeech) {
         if (Build.VERSION.SDK_INT < 15) {
-            tts
-                    .setOnUtteranceCompletedListener(new android.speech.tts.TextToSpeech.OnUtteranceCompletedListener() {
+            tts.setOnUtteranceCompletedListener(new android.speech.tts.TextToSpeech.OnUtteranceCompletedListener() {
                         @Override
                         public void onUtteranceCompleted(String utteranceId) {
                             ruTextToSpeech.utteranceCompleted(utteranceId);
diff --git a/app/src/org/runnerup/workout/feedback/VibrationFeedback.java b/app/src/org/runnerup/workout/feedback/VibrationFeedback.java
index ece318405..768b53489 100644
--- a/app/src/org/runnerup/workout/feedback/VibrationFeedback.java
+++ b/app/src/org/runnerup/workout/feedback/VibrationFeedback.java
@@ -17,22 +17,17 @@
 
 package org.runnerup.workout.feedback;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 
 import org.runnerup.workout.Feedback;
 import org.runnerup.workout.Workout;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class VibrationFeedback extends Feedback {
 
     @Override
     public boolean equals(Feedback _other) {
-        if (!(_other instanceof VibrationFeedback))
-            return false;
-
-        return true;
+        return _other instanceof VibrationFeedback;
     }
 
     @Override
diff --git a/build.gradle b/build.gradle
index cf6a4c0bf..55b337d03 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,5 +34,5 @@ project.ext {
 
     travisBuild = System.getenv("TRAVIS") == "true"
     // allows for -Dpre-dex=false to be set
-    preDexEnabled = "true".equals(System.getProperty("pre-dex", "true"))
+    preDexEnabled = "true" == System.getProperty("pre-dex", "true")
 }
diff --git a/common/src/main/java/org/runnerup/common/tracker/TrackerState.java b/common/src/main/java/org/runnerup/common/tracker/TrackerState.java
index 8f85bdf70..74ac2b1c8 100644
--- a/common/src/main/java/org/runnerup/common/tracker/TrackerState.java
+++ b/common/src/main/java/org/runnerup/common/tracker/TrackerState.java
@@ -16,15 +16,12 @@
  */
 package org.runnerup.common.tracker;
 
-import android.annotation.TargetApi;
-import android.os.Build;
-
 import org.runnerup.common.util.Constants;
 
 /**
 * Created by jonas on 12/12/14.
 */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public enum TrackerState {
     INIT(Constants.TRACKER_STATE.INIT),                // initial state
     INITIALIZING(Constants.TRACKER_STATE.INITIALIZING),// initializing components
@@ -76,8 +73,6 @@ public static TrackerState valueOf(int val) {
     public static boolean equals(TrackerState oldVal, TrackerState newVal) {
         if (oldVal != null && newVal != null)
             return oldVal.getValue() == newVal.getValue();
-        if (oldVal == null && newVal == null)
-            return true;
-        return false;
+        return oldVal == null && newVal == null;
     }
 }
diff --git a/common/src/main/java/org/runnerup/common/util/Constants.java b/common/src/main/java/org/runnerup/common/util/Constants.java
index c3957801d..5793510d5 100644
--- a/common/src/main/java/org/runnerup/common/util/Constants.java
+++ b/common/src/main/java/org/runnerup/common/util/Constants.java
@@ -21,9 +21,9 @@ public interface Constants {
 
     String LOG = "org.runnerup";
 
-    public interface DB {
+    interface DB {
 
-        public static final String PRIMARY_KEY = "_id";
+        String PRIMARY_KEY = "_id";
 
         //DBVERSION update
         //interface DBINFO {
@@ -31,109 +31,110 @@ public interface DB {
         //    String ACCOUNT_VERSION = "account_version";
         //}
 
-        public interface ACTIVITY {
-            public static final String TABLE = "activity";
-            public static final String START_TIME = "start_time";
-            public static final String DISTANCE = "distance";
-            public static final String TIME = "time";
-            public static final String NAME = "name";
-            public static final String COMMENT = "comment";
-            public static final String SPORT = "type";
-            public static final String MAX_HR = "avg_hr";
-            public static final String AVG_HR = "max_hr";
-            public static final String AVG_CADENCE = "avg_cadence";
-            public static final String META_DATA = "meta_data";
-            public static final String DELETED = "deleted";
-            public static final String NULLCOLUMNHACK = "nullColumnHack";
-
-            public static final int SPORT_RUNNING = 0;
-            public static final int SPORT_BIKING = 1;
-            public static final int SPORT_OTHER = 2; // unknown
-            public static final int SPORT_ORIENTEERING = 3;
-            public static final int SPORT_WALKING = 4;
-            public static final String WITH_BAROMETER = "<WithBarometer/>";
+        interface ACTIVITY {
+            String TABLE = "activity";
+            String START_TIME = "start_time";
+            String DISTANCE = "distance";
+            String TIME = "time";
+            String NAME = "name";
+            String COMMENT = "comment";
+            String SPORT = "type";
+            String MAX_HR = "avg_hr";
+            String AVG_HR = "max_hr";
+            String AVG_CADENCE = "avg_cadence";
+            String META_DATA = "meta_data";
+            String DELETED = "deleted";
+            String NULLCOLUMNHACK = "nullColumnHack";
+
+            int SPORT_RUNNING = 0;
+            int SPORT_BIKING = 1;
+            int SPORT_OTHER = 2; // unknown
+            int SPORT_ORIENTEERING = 3;
+            int SPORT_WALKING = 4;
+            String WITH_BAROMETER = "<WithBarometer/>";
         }
 
-        public interface LOCATION {
-            public static final String TABLE = "location";
-            public static final String ACTIVITY = "activity_id";
-            public static final String LAP = "lap";
-            public static final String TYPE = "type";
-            public static final String TIME = "time"; // in milliseconds since epoch
-            public static final String ELAPSED = "elapsed";
-            public static final String DISTANCE = "distance";
-            public static final String LATITUDE = "latitude";
-            public static final String LONGITUDE = "longitude";
-            public static final String ACCURANCY = "accurancy";
-            public static final String ALTITUDE = "altitude";
-            public static final String GPS_ALTITUDE = "gps_altitude";
-            public static final String SPEED = "speed";
-            public static final String BEARING = "bearing";
-            public static final String SATELLITES = "satellites";
-            public static final String HR = "hr";
-            public static final String CADENCE = "cadence";
-            public static final String TEMPERATURE = "temperature";
-            public static final String PRESSURE = "pressure";
-
-            public static final int TYPE_START = 1;
-            public static final int TYPE_END = 2;
-            public static final int TYPE_GPS = 3;
-            public static final int TYPE_PAUSE = 4;
-            public static final int TYPE_RESUME = 5;
-            public static final int TYPE_DISCARD = 6;
+        interface LOCATION {
+            String TABLE = "location";
+            String ACTIVITY = "activity_id";
+            String LAP = "lap";
+            String TYPE = "type";
+            String TIME = "time"; // in milliseconds since epoch
+            String ELAPSED = "elapsed";
+            String DISTANCE = "distance";
+            String LATITUDE = "latitude";
+            String LONGITUDE = "longitude";
+            String ACCURANCY = "accurancy";
+            String ALTITUDE = "altitude";
+            String GPS_ALTITUDE = "gps_altitude";
+            String SPEED = "speed";
+            String BEARING = "bearing";
+            String SATELLITES = "satellites";
+            String HR = "hr";
+            String CADENCE = "cadence";
+            String TEMPERATURE = "temperature";
+            String PRESSURE = "pressure";
+
+            int TYPE_START = 1;
+            int TYPE_END = 2;
+            int TYPE_GPS = 3;
+            int TYPE_PAUSE = 4;
+            int TYPE_RESUME = 5;
+            int TYPE_DISCARD = 6;
         }
 
-        public interface LAP {
-            public static final String TABLE = "lap";
-            public static final String ACTIVITY = "activity_id";
-            public static final String LAP = "lap";
-            public static final String INTENSITY = "type";
-            public static final String TIME = "time";
-            public static final String DISTANCE = "distance";
-            public static final String PLANNED_TIME = "planned_time";
-            public static final String PLANNED_DISTANCE = "planned_distance";
-            public static final String PLANNED_PACE = "planned_pace";
-            public static final String AVG_HR = "avg_hr";
-            public static final String MAX_HR = "max_hr";
-            public static final String AVG_CADENCE = "avg_cadence";
+        interface LAP {
+            String TABLE = "lap";
+            String ACTIVITY = "activity_id";
+            String LAP = "lap";
+            String INTENSITY = "type";
+            String TIME = "time";
+            String DISTANCE = "distance";
+            String PLANNED_TIME = "planned_time";
+            String PLANNED_DISTANCE = "planned_distance";
+            String PLANNED_PACE = "planned_pace";
+            String AVG_HR = "avg_hr";
+            String MAX_HR = "max_hr";
+            String AVG_CADENCE = "avg_cadence";
         }
 
-        public interface INTENSITY {
-            public static final int ACTIVE = 0;
-            public static final int RESTING = 1;
-            public static final int WARMUP = 2;
-            public static final int COOLDOWN = 3;
-            public static final int REPEAT = 4;
-            public static final int RECOVERY = 5;
+        interface INTENSITY {
+            int ACTIVE = 0;
+            int RESTING = 1;
+            int WARMUP = 2;
+            int COOLDOWN = 3;
+            int REPEAT = 4;
+            int RECOVERY = 5;
         }
 
-        public interface DIMENSION {
-            public static final int TIME = 1;
-            public static final int DISTANCE = 2;
-            public static final int SPEED = 3;
-            public static final int PACE = 4;
-            public static final int HR = 5;
-            public static final int HRZ = 6;
-            public static final int CAD = 7;
-            public static final int TEMPERATURE = 8;
-            public static final int PRESSURE = 9;
+        interface DIMENSION {
+            int TIME = 1;
+            int DISTANCE = 2;
+            int SPEED = 3;
+            int PACE = 4;
+            int HR = 5;
+            int HRZ = 6;
+            int CAD = 7;
+            int TEMPERATURE = 8;
+            int PRESSURE = 9;
         }
 
-        public interface ACCOUNT {
-            public static final String TABLE = "account";
-            public static final String NAME = "name";
-            public static final String FLAGS = "default_send";
-            public static final String ENABLED = "enabled";
-            public static final String AUTH_CONFIG = "auth_config";
+        interface ACCOUNT {
+            String TABLE = "account";
+            String NAME = "name";
+            String FLAGS = "default_send";
+            String ENABLED = "enabled";
+            String AUTH_CONFIG = "auth_config";
 
             String URL = "url";
             String FORMAT = "format";
 
-            public static final int FLAG_UPLOAD = 0;
-            public static final int FLAG_FEED = 1;
-            public static final int FLAG_LIVE = 2;
-            public static final int FLAG_SKIP_MAP = 3;
-            public static final long DEFAULT_FLAGS =
+            int FLAG_UPLOAD = 0;
+            int FLAG_FEED = 1;
+            int FLAG_LIVE = 2;
+            int FLAG_SKIP_MAP = 3;
+            @SuppressWarnings("PointlessBitwiseExpression")
+            long DEFAULT_FLAGS =
                     (1 << FLAG_UPLOAD) +
                             (1 << FLAG_FEED) +
                             (1 << FLAG_LIVE);
@@ -144,114 +145,112 @@ public interface ACCOUNT {
             String AUTH_NOTICE = "auth_notice";
         }
 
-        public interface EXPORT {
-            public static final String TABLE = "report";
-            public static final String ACTIVITY = "activity_id";
-            public static final String ACCOUNT = "account_id";
-            public static final String STATUS = "status";
-            public static final String EXTERNAL_ID = "ext_id";
-            public static final String EXTRA = "extra";
+        interface EXPORT {
+            String TABLE = "report";
+            String ACTIVITY = "activity_id";
+            String ACCOUNT = "account_id";
+            String STATUS = "status";
+            String EXTERNAL_ID = "ext_id";
+            String EXTRA = "extra";
         }
 
-        public interface AUDIO_SCHEMES {
-            public static final String TABLE = "audio_schemes";
-            public static final String NAME = "name";
-            public static final String SORT_ORDER = "sort_order";
+        interface AUDIO_SCHEMES {
+            String TABLE = "audio_schemes";
+            String NAME = "name";
+            String SORT_ORDER = "sort_order";
         }
 
-        public interface FEED {
-            public static final String TABLE = "feed";
-            public static final String ACCOUNT_ID = "account_id";
-            public static final String EXTERNAL_ID = "ext_id"; // ID per account
-            public static final String FEED_TYPE = "entry_type";
-            public static final String FEED_SUBTYPE = "type";
-            public static final String FEED_TYPE_STRING = "type_string";
-            public static final String START_TIME = "start_time";
-            public static final String DURATION = "duration";
-            public static final String DISTANCE = "distance";
-            public static final String USER_ID = "user_id";
-            public static final String USER_FIRST_NAME = "user_first_name";
-            public static final String USER_LAST_NAME = "user_last_name";
-            public static final String USER_IMAGE_URL = "user_image_url";
-            public static final String NOTES = "notes";
-            public static final String COMMENTS = "comments";
-            public static final String URL = "url";
-            public static final String FLAGS = "flags";
-
-            public static final int FEED_TYPE_ACTIVITY = 0; // FEED_SUBTYPE
-                                                            // contains
-                                                            // activity.type
-            public static final int FEED_TYPE_EVENT = 1;
-
-            public static final int FEED_TYPE_EVENT_DATE_HEADER = 0;
+        interface FEED {
+            String TABLE = "feed";
+            String ACCOUNT_ID = "account_id";
+            String EXTERNAL_ID = "ext_id"; // ID per account
+            String FEED_TYPE = "entry_type";
+            String FEED_SUBTYPE = "type";
+            String FEED_TYPE_STRING = "type_string";
+            String START_TIME = "start_time";
+            String DURATION = "duration";
+            String DISTANCE = "distance";
+            String USER_ID = "user_id";
+            String USER_FIRST_NAME = "user_first_name";
+            String USER_LAST_NAME = "user_last_name";
+            String USER_IMAGE_URL = "user_image_url";
+            String NOTES = "notes";
+            String COMMENTS = "comments";
+            String URL = "url";
+            String FLAGS = "flags";
+
+            int FEED_TYPE_ACTIVITY = 0; // FEED_SUBTYPE contains activity.type
+            int FEED_TYPE_EVENT = 1;
+
+            int FEED_TYPE_EVENT_DATE_HEADER = 0;
         }
     }
 
-    public interface Intents {
-        final String PAUSE_RESUME = "org.runnerup.PAUSE_RESUME";
-        final String NEW_LAP = "org.runnerup.NEW_LAP";
-        final String FROM_NOTIFICATION = "org.runnerup.FROM_NOTIFICATION";
-        final String START_WORKOUT = "org.runnerup.START_WORKOUT";
-        final String PAUSE_WORKOUT = "org.runnerup.PAUSE_WORKOUT";
-        final String RESUME_WORKOUT = "org.runnerup.RESUME_WORKOUT";
+    interface Intents {
+        String PAUSE_RESUME = "org.runnerup.PAUSE_RESUME";
+        String NEW_LAP = "org.runnerup.NEW_LAP";
+        String FROM_NOTIFICATION = "org.runnerup.FROM_NOTIFICATION";
+        String START_WORKOUT = "org.runnerup.START_WORKOUT";
+        String PAUSE_WORKOUT = "org.runnerup.PAUSE_WORKOUT";
+        String RESUME_WORKOUT = "org.runnerup.RESUME_WORKOUT";
     }
 
-    public interface TRACKER_STATE {
-        public static final int INIT = 0;         // initial state
-        public static final int INITIALIZING = 1; // initializing components
-        public static final int INITIALIZED = 2;  // initialized
-        public static final int STARTED = 3;      // Workout started
-        public static final int PAUSED = 4;       // Workout paused
-        public static final int CLEANUP = 5;      // Cleaning up components
-        public static final int ERROR = 6;        // Components failed to initialize ;
-        public static final int CONNECTING = 7;
-        public static final int CONNECTED = 8;
-        public static final int STOPPED = 9;
+    interface TRACKER_STATE {
+        int INIT = 0;         // initial state
+        int INITIALIZING = 1; // initializing components
+        int INITIALIZED = 2;  // initialized
+        int STARTED = 3;      // Workout started
+        int PAUSED = 4;       // Workout paused
+        int CLEANUP = 5;      // Cleaning up components
+        int ERROR = 6;        // Components failed to initialize ;
+        int CONNECTING = 7;
+        int CONNECTED = 8;
+        int STOPPED = 9;
     }
 
-    public interface WORKOUT_TYPE {
-        public static final int BASIC = 0;
-        public static final int INTERVAL = 1;
-        public static final int ADVANCED = 2;
+    interface WORKOUT_TYPE {
+        int BASIC = 0;
+        int INTERVAL = 1;
+        int ADVANCED = 2;
     }
 
-    public interface Wear {
+    interface Wear {
 
-        public interface Path {
-            static final String PREFIX = "/org.runnerup";
+        interface Path {
+            String PREFIX = "/org.runnerup";
 
             /* Data: phone/wear nodes */
-            static final String WEAR_NODE_ID = PREFIX + "/config/wear/node_id";
-            static final String PHONE_NODE_ID = PREFIX + "/config/phone/node_id";
+            String WEAR_NODE_ID = PREFIX + "/config/wear/node_id";
+            String PHONE_NODE_ID = PREFIX + "/config/phone/node_id";
 
             /* Data: Card headers */
-            static final String HEADERS = PREFIX + "/config/headers";
+            String HEADERS = PREFIX + "/config/headers";
 
             /* Data: Tracker/workout state */
-            static final String TRACKER_STATE = PREFIX + "/tracker/state";
-            static final String WORKOUT_PLAN = PREFIX + "/workout/plan";
+            String TRACKER_STATE = PREFIX + "/tracker/state";
+            String WORKOUT_PLAN = PREFIX + "/workout/plan";
 
             /* Msg: workout event */
-            static final String MSG_WORKOUT_EVENT = PREFIX + "/workout/event";
+            String MSG_WORKOUT_EVENT = PREFIX + "/workout/event";
 
             /* Msg: pause/resume from wear to phone */
-            static final String MSG_CMD_WORKOUT_PAUSE = PREFIX + "/workout/pause";
-            static final String MSG_CMD_WORKOUT_RESUME = PREFIX + "/workout/resume";
-            static final String MSG_CMD_WORKOUT_NEW_LAP = PREFIX + "/workout/new_lap";
-            static final String MSG_CMD_WORKOUT_START = PREFIX + "/workout/start";
+            String MSG_CMD_WORKOUT_PAUSE = PREFIX + "/workout/pause";
+            String MSG_CMD_WORKOUT_RESUME = PREFIX + "/workout/resume";
+            String MSG_CMD_WORKOUT_NEW_LAP = PREFIX + "/workout/new_lap";
+            String MSG_CMD_WORKOUT_START = PREFIX + "/workout/start";
         }
 
-        public interface RunInfo {
-            static final String HEADER = "HEADER/";
-            static final String DATA = "DATA/";
-            static final String SCREENS = "SCREENS"; // Array of screen sizes, stored in HEADERS
-            static final String PAUSE_STEP = "PAUSE_STEP"; // Stored in HEADERS
-            static final String SCROLL = "SCROLL"; // Stored in HEADERS
-            static final String COUNTDOWN = "COUNTDOWN";   // Stored in DATA
+        interface RunInfo {
+            String HEADER = "HEADER/";
+            String DATA = "DATA/";
+            String SCREENS = "SCREENS"; // Array of screen sizes, stored in HEADERS
+            String PAUSE_STEP = "PAUSE_STEP"; // Stored in HEADERS
+            String SCROLL = "SCROLL"; // Stored in HEADERS
+            String COUNTDOWN = "COUNTDOWN";   // Stored in DATA
         }
 
-        public interface TrackerState {
-            static final String STATE = "state";
+        interface TrackerState {
+            String STATE = "state";
         }
     }
 }
diff --git a/common/src/main/java/org/runnerup/common/util/ValueModel.java b/common/src/main/java/org/runnerup/common/util/ValueModel.java
index 05ae6a64c..fa8509ca3 100644
--- a/common/src/main/java/org/runnerup/common/util/ValueModel.java
+++ b/common/src/main/java/org/runnerup/common/util/ValueModel.java
@@ -16,20 +16,14 @@
  */
 package org.runnerup.common.util;
 
-import android.annotation.TargetApi;
-import android.os.Build;
-
 import java.util.ArrayList;
 
-/**
- * Created by jonas on 12/29/14.
- */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class ValueModel<T> {
 
     private T value;
     final private ArrayList<ChangeListener<T>> listeners =
-            new ArrayList<ChangeListener<T>>();
+            new ArrayList<>();
 
     public interface ChangeListener<T> {
         void onValueChanged(ValueModel<T> instance, T oldValue, T newValue);
@@ -54,11 +48,11 @@ public void set(T newValue) {
         T oldValue = value;
         value = newValue;
 
-        /**
+        /*
          * iterate over copy so that this can be modified during iteration
          * (i.e by onValueChanged())
          */
-        ArrayList<ChangeListener<T>> copy = new ArrayList<ChangeListener<T>>(listeners);
+        ArrayList<ChangeListener<T>> copy = new ArrayList<>(listeners);
         for (ChangeListener<T> l : copy) {
             l.onValueChanged(this, oldValue, newValue);
         }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 04f8ba9d0..402ab0cca 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Sun Mar 05 11:10:48 CET 2017
+#Thu Apr 06 23:30:08 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/hrdevice/src/org/runnerup/hr/AndroidBLEHRProvider.java b/hrdevice/src/org/runnerup/hr/AndroidBLEHRProvider.java
index a2a544926..3f9b42e8e 100644
--- a/hrdevice/src/org/runnerup/hr/AndroidBLEHRProvider.java
+++ b/hrdevice/src/org/runnerup/hr/AndroidBLEHRProvider.java
@@ -43,7 +43,10 @@
  *
  * @author jonas
  */
-@TargetApi(18)
+
+//This class must only be used with 4.3 or later, calling checkLibrary()
+@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
+
 public class AndroidBLEHRProvider extends BtHRBase implements HRProvider {
 
     public static boolean checkLibrary(Context ctx) {
@@ -51,28 +54,27 @@ public static boolean checkLibrary(Context ctx) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2)
             return false;
 
-        if (!ctx.getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_BLUETOOTH_LE)) {
-            return false;
-        }
-
-        return true;
+        return ctx.getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_BLUETOOTH_LE);
     }
 
     static final String NAME = "AndroidBLE";
-    static final String DISPLAY_NAME = "Bluetooth SMART (BLE)";
+    private static final String DISPLAY_NAME = "Bluetooth SMART (BLE)";
 
-    static final UUID[] SCAN_UUIDS = {
+    private static final UUID[] SCAN_UUIDS = {
         HRP_SERVICE
     };
-    static boolean AVOID_SCAN_WITH_UUID = false;
-    static boolean CONNECT_IN_OWN_THREAD_FROM_ON_LE_SCAN = false;
+    private final static boolean AVOID_SCAN_WITH_UUID;
+    private final static boolean CONNECT_IN_OWN_THREAD_FROM_ON_LE_SCAN;
 
     static {
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR2) {
             // 4.3
             AVOID_SCAN_WITH_UUID = true;
             CONNECT_IN_OWN_THREAD_FROM_ON_LE_SCAN = true;
+        } else {
+            AVOID_SCAN_WITH_UUID = false;
+            CONNECT_IN_OWN_THREAD_FROM_ON_LE_SCAN = false;
         }
     }
 
@@ -215,7 +217,6 @@ public void onCharacteristicRead(BluetoothGatt gatt,
                     log("firmware => startHR()");
                     // triggered from DummyReadForSecLevelCheck
                     startHR();
-                    return;
                 } else if (charUuid.equals(BATTERY_LEVEL_CHARAC)) {
                     log("batterylevel: " + arg0);
                     batteryLevel = arg0.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT8, 0);
@@ -224,7 +225,6 @@ public void onCharacteristicRead(BluetoothGatt gatt,
                     log(" => startHR()");
                     // triggered from DummyReadForSecLevelCheck
                     startHR();
-                    return;
 
                 } else {
                     log("Unknown characteristic received: " + charUuid);
@@ -235,12 +235,6 @@ public void onCharacteristicRead(BluetoothGatt gatt,
             }
         }
 
-        @Override
-        public void onCharacteristicWrite(BluetoothGatt gatt,
-                                          BluetoothGattCharacteristic characteristic, int status) {
-            super.onCharacteristicWrite(gatt, characteristic, status);
-        }
-
         @Override
         public void onConnectionStateChange(BluetoothGatt gatt, int status,
                                             int newState) {
@@ -302,22 +296,6 @@ public void onDescriptorRead(BluetoothGatt gatt,
             }
         }
 
-        @Override
-        public void onDescriptorWrite(BluetoothGatt gatt,
-                                      BluetoothGattDescriptor descriptor, int status) {
-            super.onDescriptorWrite(gatt, descriptor, status);
-        }
-
-        @Override
-        public void onReadRemoteRssi(BluetoothGatt gatt, int rssi, int status) {
-            super.onReadRemoteRssi(gatt, rssi, status);
-        }
-
-        @Override
-        public void onReliableWriteCompleted(BluetoothGatt gatt, int status) {
-            super.onReliableWriteCompleted(gatt, status);
-        }
-
         @Override
         public void onServicesDiscovered(BluetoothGatt gatt, int status) {
             log("onServicesDiscoverd(): " + gatt + ", status: "
@@ -376,16 +354,14 @@ private void DummyReadForSecLevelCheck(BluetoothGatt btGatt) {
                 return;
             }
 
-            if (btGatt.readCharacteristic(firmwareIdCharc) == false) {
+            if (!btGatt.readCharacteristic(firmwareIdCharc)) {
                 reportConnectFailed("firmware revison reading is failed!");
             }
             // continue in onCharacteristicRead
         }
 
         private boolean isHeartRateInUINT16(byte b) {
-            if ((b & 1) != 0)
-                return true;
-            return false;
+            return (b & 1) != 0;
         }
 
         private void startHR() {
@@ -406,9 +382,8 @@ private void startHR() {
                 reportConnectFailed("CCC for HEART RATE MEASUREMENT charateristic not found!");
                 return;
             }
-            if (btGatt.readDescriptor(mHRMccc) == false) {
+            if (!btGatt.readDescriptor(mHRMccc)) {
                 reportConnectFailed("readDescriptor() is failed");
-                return;
             }
             // Continue in onDescriptorRead
         }
@@ -436,8 +411,9 @@ private boolean readBatteryLevel() {
         }
     };
 
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     private boolean enableNotification(boolean onoff,
-            BluetoothGattCharacteristic charac) {
+                                       BluetoothGattCharacteristic charac) {
         if (btGatt == null)
             return false;
 
@@ -524,7 +500,7 @@ public void run() {
 
     };
 
-    final HashSet<String> mScanDevices = new HashSet<String>();
+    private final HashSet<String> mScanDevices = new HashSet<>();
 
     @Override
     public void startScan() {
@@ -579,7 +555,7 @@ public void connect(HRDeviceRef ref) {
         btDevice = dev;
         if (ref.deviceName == null || dev.getName() == null
                 || !dev.getName().contentEquals(ref.deviceName)) {
-            /**
+            /*
              * If device doesn't match name, scan for before connecting
              */
             log("Scan before connect");
@@ -633,10 +609,10 @@ public void disconnect() {
         }
 
         boolean isConnected = mIsConnected;
-        if (mIsConnecting == false && mIsConnected == false)
+        if (!mIsConnecting && !mIsConnected)
             return;
 
-        if (mIsDisconnecting == true)
+        if (mIsDisconnecting)
             return;
 
         mIsConnected = false;
@@ -738,10 +714,12 @@ public int getBatteryLevel() {
         return this.batteryLevel;
     }
 
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     private boolean checkBtGatt(BluetoothGatt gatt) {
         return checkBtGatt(gatt, false);
     }
 
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     private boolean checkBtGattOnlyLogError(BluetoothGatt gatt) {
         return checkBtGatt(gatt, true);
     }
diff --git a/hrdevice/src/org/runnerup/hr/AntPlus.java b/hrdevice/src/org/runnerup/hr/AntPlus.java
index bf85f2e01..fd8f3dfe7 100644
--- a/hrdevice/src/org/runnerup/hr/AntPlus.java
+++ b/hrdevice/src/org/runnerup/hr/AntPlus.java
@@ -17,10 +17,8 @@
 
 package org.runnerup.hr;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
-import android.os.Build;
 import android.os.Handler;
 
 import com.dsi.ant.plugins.antplus.pcc.AntPlusHeartRatePcc;
@@ -44,20 +42,20 @@
  *
  * @author jonas
  */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class AntPlus extends BtHRBase {
 
     static final String NAME = "AntPlus";
-    static final String DISPLAY_NAME = "ANT+";
+    private static final String DISPLAY_NAME = "ANT+";
 
-    final Context context;
-    int hrValue;
-    long hrTimestamp;
+    private final Context context;
+    private int hrValue;
+    private long hrTimestamp;
 
-    HRDeviceRef connectRef = null;
+    private HRDeviceRef connectRef = null;
 
     AntPlusHeartRatePcc hrPcc = null;
-    AsyncScanController<AntPlusHeartRatePcc> hrScanCtrl = null;
+    private AsyncScanController<AntPlusHeartRatePcc> hrScanCtrl = null;
 
     private boolean mIsScanning = false;
     private boolean mIsConnected = false;
@@ -150,8 +148,8 @@ public void stopScan() {
         }
     }
 
-    final HashSet<String> mScanDevices = new HashSet<String>();
-    final IAsyncScanResultReceiver scanReceiver = new IAsyncScanResultReceiver() {
+    private final HashSet<String> mScanDevices = new HashSet<>();
+    private final IAsyncScanResultReceiver scanReceiver = new IAsyncScanResultReceiver() {
 
         @Override
         public void onSearchResult(final AsyncScanResultDeviceInfo arg0) {
@@ -209,9 +207,9 @@ public void connect(HRDeviceRef ref) {
                 resultReceiver, stateReceiver);
     }
 
-    AntPlusHeartRatePcc antDevice = null;
+    private AntPlusHeartRatePcc antDevice = null;
 
-    final IPluginAccessResultReceiver<AntPlusHeartRatePcc> resultReceiver = new IPluginAccessResultReceiver<AntPlusHeartRatePcc>() {
+    private final IPluginAccessResultReceiver<AntPlusHeartRatePcc> resultReceiver = new IPluginAccessResultReceiver<AntPlusHeartRatePcc>() {
 
         @Override
         public void onResultReceived(AntPlusHeartRatePcc arg0,
@@ -254,7 +252,7 @@ public void onResultReceived(AntPlusHeartRatePcc arg0,
         }
     };
 
-    final IHeartRateDataReceiver heartRateDataReceiver = new IHeartRateDataReceiver() {
+    private final IHeartRateDataReceiver heartRateDataReceiver = new IHeartRateDataReceiver() {
 
         @Override
         public void onNewHeartRateData(long arg0, EnumSet<EventFlag> arg1,
@@ -289,7 +287,7 @@ else if (mIsConnected)
         }
     };
 
-    final IDeviceStateChangeReceiver stateReceiver = new IDeviceStateChangeReceiver() {
+    private final IDeviceStateChangeReceiver stateReceiver = new IDeviceStateChangeReceiver() {
 
         @Override
         public void onDeviceStateChange(DeviceState arg0) {
@@ -299,7 +297,7 @@ public void onDeviceStateChange(DeviceState arg0) {
                     break;
                 case DEAD:
                     if (mIsConnected) {
-                        /** don't silent reconnect, let upper lay handle that */
+                        /* don't silent reconnect, let upper lay handle that */
                         reportDisconnected(true);
                         return;
                     }
@@ -335,13 +333,12 @@ public void run() {
         }
     }
 
-    protected void reportConnected(final boolean b) {
+    private void reportConnected(final boolean b) {
         hrClientHandler.post(new Runnable() {
             @Override
             public void run() {
                 if (hrClient == null) {
                     disconnectImpl();
-                    return;
                 } else if (mIsConnecting) {
                     mIsConnected = b;
                     mIsConnecting = false;
@@ -351,7 +348,7 @@ public void run() {
         });
     }
 
-    protected void reportDisconnected(final boolean b) {
+    private void reportDisconnected(final boolean b) {
         disconnectImpl();
         hrClientHandler.post(new Runnable() {
             @Override
diff --git a/hrdevice/src/org/runnerup/hr/Bt20Base.java b/hrdevice/src/org/runnerup/hr/Bt20Base.java
index f3c4fc839..4a91362bf 100644
--- a/hrdevice/src/org/runnerup/hr/Bt20Base.java
+++ b/hrdevice/src/org/runnerup/hr/Bt20Base.java
@@ -17,6 +17,7 @@
 
 package org.runnerup.hr;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
@@ -65,15 +66,13 @@ public static boolean startEnableIntentImpl(Activity activity, int requestCode)
         return true;
     }
 
+    @SuppressLint("ObsoleteSdkInt")
     public static boolean checkLibrary(@SuppressWarnings("UnusedParameters") Context ctx) {
 
         // Don't bother if createInsecureRfcommSocketToServiceRecord isn't
         // available
-        //noinspection RedundantIfStatement
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.GINGERBREAD_MR1)
-            return false;
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD_MR1;
 
-        return true;
     }
 
     // UUID
@@ -88,7 +87,7 @@ public static boolean checkLibrary(@SuppressWarnings("UnusedParameters") Context
 
     // private Context context = null;
 
-    public Bt20Base(@SuppressWarnings("UnusedParameters") Context ctx) {
+    Bt20Base(@SuppressWarnings("UnusedParameters") Context ctx) {
         // context = ctx;
     }
 
@@ -200,7 +199,7 @@ public void startScan() {
         hrClientHandler.post(new Runnable() {
             @Override
             public void run() {
-                Set<BluetoothDevice> list = new HashSet<BluetoothDevice>();
+                Set<BluetoothDevice> list = new HashSet<>();
                 list.addAll(btAdapter.getBondedDevices());
                 publishDevice(list);
             }
@@ -589,9 +588,9 @@ public int parseBuffer(byte[] buffer, int bytesInBuffer, Integer[] hr) {
         public abstract int findNextAlignment(byte buffer[]);
     }
 
-    public abstract int getFrameSize();
+    protected abstract int getFrameSize();
 
-    public abstract int parseBuffer(byte[] buffer, int bytesInBuffer, Integer[] hr);
+    protected abstract int parseBuffer(byte[] buffer, int bytesInBuffer, Integer[] hr);
 
     public static class ZephyrHRM extends Bt20BaseOld {
 
diff --git a/hrdevice/src/org/runnerup/hr/BtHRBase.java b/hrdevice/src/org/runnerup/hr/BtHRBase.java
index c3e871987..a908da1a6 100644
--- a/hrdevice/src/org/runnerup/hr/BtHRBase.java
+++ b/hrdevice/src/org/runnerup/hr/BtHRBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 jonas.oreland@gmail.com
+ * Copyright (C) 2014 jonas.oreland@gmail.com
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,18 +16,13 @@
  */
 package org.runnerup.hr;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 
 import java.util.UUID;
 
-/**
- * Created by jonas on 11/1/14.
- */
-@TargetApi(Build.VERSION_CODES.FROYO)
-public abstract class BtHRBase implements HRProvider {
+
+abstract class BtHRBase implements HRProvider {
     static final UUID HRP_SERVICE = UUID
             .fromString("0000180D-0000-1000-8000-00805f9b34fb");
     static final UUID BATTERY_SERVICE = UUID
@@ -43,10 +38,10 @@ public abstract class BtHRBase implements HRProvider {
     static final UUID CCC = UUID
             .fromString("00002902-0000-1000-8000-00805f9b34fb");
 
-    protected HRProvider.HRClient hrClient;
-    protected Handler hrClientHandler;
+    HRProvider.HRClient hrClient;
+    Handler hrClientHandler;
 
-    protected void log (final String msg) {
+    void log(final String msg) {
         if (hrClient != null) {
             if(Looper.myLooper() == Looper.getMainLooper()) {
                 hrClient.log(this, msg);
diff --git a/hrdevice/src/org/runnerup/hr/HRData.java b/hrdevice/src/org/runnerup/hr/HRData.java
index 4ae7384f6..460dcc0e8 100644
--- a/hrdevice/src/org/runnerup/hr/HRData.java
+++ b/hrdevice/src/org/runnerup/hr/HRData.java
@@ -1,8 +1,5 @@
 package org.runnerup.hr;
 
-import android.annotation.TargetApi;
-import android.os.Build;
-
 import java.util.Arrays;
 
 /**
@@ -36,19 +33,19 @@
  * }
  * </pre>
  */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class HRData {
     
     public boolean hasHeartRate = false;
     public long hrValue = -1;
-    public boolean timeStampIsFromDevice = false;
+    private boolean timeStampIsFromDevice = false;
     public long timestamp = -1;
-    public boolean hasRrIntervals = false;
-    public long[] rrIntervals = null;
+    private boolean hasRrIntervals = false;
+    private long[] rrIntervals = null;
 
     @Override
     public String toString() {
-        String sb = "HRData{" + ", hrValue=" + (hasHeartRate ? hrValue : "<no_heart_rate_data>") +
+        return "HRData{" + ", hrValue=" + (hasHeartRate ? hrValue : "<no_heart_rate_data>") +
                 '\n' +
                 ", timeStampIsFromDevice=" + timeStampIsFromDevice +
                 '\n' +
@@ -57,7 +54,6 @@ public String toString() {
                 ", rrIntervals=" + (hasRrIntervals ? Arrays.toString(rrIntervals) : "<no_rr_interval_data>") +
                 '\n' +
                 '}';
-        return sb;
     }
 
     public HRData setHeartRate(long heartRate){
diff --git a/hrdevice/src/org/runnerup/hr/HRDeviceRef.java b/hrdevice/src/org/runnerup/hr/HRDeviceRef.java
index e037bf028..7c73b9a48 100644
--- a/hrdevice/src/org/runnerup/hr/HRDeviceRef.java
+++ b/hrdevice/src/org/runnerup/hr/HRDeviceRef.java
@@ -17,19 +17,16 @@
 
 package org.runnerup.hr;
 
-import android.annotation.TargetApi;
-import android.os.Build;
-
 /**
  * This interface is used instead as a device handle. (since Ant+ doesn't used
  * BluetoothDevice as a device representation)
  * 
  * @author jonas
  */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class HRDeviceRef {
 
-    public final String provider;
+    private final String provider;
     public final String deviceName;
     public final String deviceAddress;
 
diff --git a/hrdevice/src/org/runnerup/hr/HRManager.java b/hrdevice/src/org/runnerup/hr/HRManager.java
index 322e1a7ca..cffc52f7e 100644
--- a/hrdevice/src/org/runnerup/hr/HRManager.java
+++ b/hrdevice/src/org/runnerup/hr/HRManager.java
@@ -17,7 +17,6 @@
 
 package org.runnerup.hr;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
@@ -33,14 +32,14 @@
  *
  * @author jonas
  */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class HRManager {
 
     /**
      * @return true if device is 4.2, 4.2.1 and 4.2.2 AND the samsung ble sdk is available,
      *          false otherwise
      */
-    public static boolean checkSamsungBLELibrary() {
+    private static boolean checkSamsungBLELibrary() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2)
             return false;
 
@@ -61,7 +60,7 @@ public static boolean checkSamsungBLELibrary() {
         return false;
     }
 
-    public static HRProvider createProviderByReflection(String clazz, Context ctx) {
+    private static HRProvider createProviderByReflection(String clazz, Context ctx) {
         try {
             Class<?> classDefinition = Class.forName(clazz);
             Constructor<?> cons = classDefinition.getConstructor(Context.class);
@@ -74,7 +73,7 @@ public static HRProvider createProviderByReflection(String clazz, Context ctx) {
     /**
      * Creates an {@link HRProvider}. This will be wrapped in a {@link RetryingHRProviderProxy}.
      * *
-     * @param src The type of {@link HRProvider} to create. See {@link #getHRProvider(android.content.Context, String)}
+     * @param src The type of {@link HRProvider} to create.
      * @return A new instance of an {@link HRProvider} or null if
      *   A) 'src' is not a valid {@link HRProvider} type
      *   B) the device does not support an {@link HRProvider} of type 'src'
@@ -84,7 +83,7 @@ public static HRProvider getHRProvider(Context ctx, String src) {
         if (provider != null) {
             return new RetryingHRProviderProxy(provider);
         }
-        return provider;
+        return null;
     }
 
     
@@ -149,7 +148,7 @@ public static List<HRProvider> getHRProviderList(Context ctx) {
                 .getBoolean(res.getString(R.string.pref_bt_experimental), false);
         boolean mock = prefs.getBoolean(res.getString(R.string.pref_bt_mock), false);
 
-        List<HRProvider> providers = new ArrayList<HRProvider>();
+        List<HRProvider> providers = new ArrayList<>();
         if (experimental && checkSamsungBLELibrary()) {
             providers.add(createProviderByReflection("org.runnerup.hr.SamsungBLEHRProvider", ctx));
         }
diff --git a/hrdevice/src/org/runnerup/hr/HRProvider.java b/hrdevice/src/org/runnerup/hr/HRProvider.java
index e7adb1562..0839fb79f 100644
--- a/hrdevice/src/org/runnerup/hr/HRProvider.java
+++ b/hrdevice/src/org/runnerup/hr/HRProvider.java
@@ -17,9 +17,7 @@
 
 package org.runnerup.hr;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
-import android.os.Build;
 import android.os.Handler;
 
 /**
@@ -30,43 +28,43 @@
  *
  * @author jonas
  */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public interface HRProvider {
 
     /**
      * An interface through which the client of the {@link HRProvider}
      * is notified of changes to the state of the {@link HRProvider}
      */
-    public interface HRClient {
-        public void onOpenResult(boolean ok);
+    interface HRClient {
+        void onOpenResult(boolean ok);
 
-        public void onScanResult(HRDeviceRef device);
+        void onScanResult(HRDeviceRef device);
 
-        public void onConnectResult(boolean connectOK);
+        void onConnectResult(boolean connectOK);
 
-        public void onDisconnectResult(boolean disconnectOK);
+        void onDisconnectResult(boolean disconnectOK);
 
-        public void onCloseResult(boolean closeOK);
+        void onCloseResult(boolean closeOK);
 
-        public void log(HRProvider src, String msg);
+        void log(HRProvider src, String msg);
     }
 
     /**
      * @return A human readable name for the {@link HRProvider}
      */
-    public abstract String getName();
+    String getName();
 
     /**
      * @return An internal name for a specific {@link HRProvider} instantiation
      */
-    public abstract String getProviderName(); // For internal usage
+    String getProviderName(); // For internal usage
 
 
     /**
      * @return true if the wireless module is enabled,
      *          false otherwise
      */
-    public abstract boolean isEnabled();
+    boolean isEnabled();
 
     /**
      * Presents the user if the settings screen to enable the provider's protocol. When this is done,
@@ -77,7 +75,7 @@ public interface HRClient {
      *                  {@link Activity#onActivityResult(int, int, android.content.Intent)}
      * @return true if the intent was sent
      */
-    public abstract boolean startEnableIntent(Activity activity, int requestCode);
+    boolean startEnableIntent(Activity activity, int requestCode);
 
     /**
      * Initialises the wireless module, allowing device scanning/connection
@@ -85,12 +83,12 @@ public interface HRClient {
      * @param handler The Handler in which to run the hrClient
      * @param hrClient The object that will be notified when operations have finished
      */
-    public abstract void open(Handler handler, HRClient hrClient);
+    void open(Handler handler, HRClient hrClient);
 
     /**
      * Closes the wireless module
      */
-    public abstract void close();
+    void close();
 
     /**
      * A bonding device is a wireless module that requires devices to be
@@ -99,70 +97,70 @@ public interface HRClient {
      * @return true if the wireless module is a bonding device,
      *          false otherwise
      */
-    public abstract boolean isBondingDevice();
+    boolean isBondingDevice();
 
     /**
      * @return true if this {@link HRProvider} is currently scanning for available devices,
      *          false otherwise
      */
-    public abstract boolean isScanning();
+    boolean isScanning();
 
     /**
      * @return true if this {@link HRProvider} is connected to a heart rate device,
      *          false otherwise
      */
-    public abstract boolean isConnected();
+    boolean isConnected();
 
     /**
      * @return true if this {@link HRProvider} is currently connecting to a heart rate device,
      *          false otherwise
      */
-    public abstract boolean isConnecting();
+    boolean isConnecting();
 
     /**
      * Starts scanning for available heart rate devices. Results will be passed to the HRClient
      * supplied in {@link #open(android.os.Handler, org.runnerup.hr.HRProvider.HRClient)}
      */
-    public abstract void startScan();
+    void startScan();
 
     /**
      * Stops scanning for available heart rate devices. When done, the {@link HRClient} passed
      * in {@link #open(android.os.Handler, org.runnerup.hr.HRProvider.HRClient)} will be notified
      */
-    public abstract void stopScan();
+    void stopScan();
 
     /**
      * Connects to a heart rate monitor device
      * @param ref An object representing a heart rate device. Client code can get
      *            available device information through startScan()
      */
-    public abstract void connect(HRDeviceRef ref);
+    void connect(HRDeviceRef ref);
 
     /**
      * Disconnects from a heart rate monitor device
      */
-    public abstract void disconnect();
+    void disconnect();
 
     /**
      * @return the most recent heart rate value supplied by the connected device.
      *          0 indicates that no device has been connected (or the user is in a very bad way)
      */
-    public abstract int getHRValue();
+    int getHRValue();
 
     /**
      * @return the unix time of the last received heart rate value
      */
-    public abstract long getHRValueTimestamp();
+    long getHRValueTimestamp();
 
     /**
      * @return the most recent heart rate data supplied by the device. If no device has
      *          been connected, this will be null
      */
-    public abstract HRData getHRData();
+    HRData getHRData();
 
     /**
      * @return The battery level, in percents, of the heart rate monitor device or 0 if
      *          no device has been connected or the device doesn't supply battery information
      */
-    public abstract int getBatteryLevel();
+    int getBatteryLevel();
 }
diff --git a/hrdevice/src/org/runnerup/hr/MockHRProvider.java b/hrdevice/src/org/runnerup/hr/MockHRProvider.java
index 4f0312987..00f93d140 100644
--- a/hrdevice/src/org/runnerup/hr/MockHRProvider.java
+++ b/hrdevice/src/org/runnerup/hr/MockHRProvider.java
@@ -1,13 +1,11 @@
 
 package org.runnerup.hr;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
-import android.os.Build;
 import android.os.Handler;
 
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class MockHRProvider implements HRProvider {
 
     private HRClient hrClient = null;
@@ -38,14 +36,14 @@ public void open(Handler handler, HRClient hrClient) {
     public void close() {
     }
 
-    boolean mIsScanning = false;
+    private boolean mIsScanning = false;
 
     @Override
     public boolean isScanning() {
         return mIsScanning;
     }
 
-    final Runnable fakeScanResult = new Runnable() {
+    private final Runnable fakeScanResult = new Runnable() {
         int count = 0;
 
         @Override
@@ -74,8 +72,8 @@ public void stopScan() {
         mIsScanning = false;
     }
 
-    boolean mIsConnecting = false;
-    boolean mIsConnected = false;
+    private boolean mIsConnecting = false;
+    private boolean mIsConnected = false;
 
     @Override
     public boolean isConnected() {
@@ -109,12 +107,12 @@ public void run() {
         }, 3000);
     }
 
-    final Runnable hrUpdate = new Runnable() {
+    private final Runnable hrUpdate = new Runnable() {
         @Override
         public void run() {
             hrValue = (int) (150 + 40 * Math.random());
             hrTimestamp = System.currentTimeMillis();
-            if (mIsConnected == true) {
+            if (mIsConnected) {
                 hrClientHandler.postDelayed(hrUpdate, 750);
             }
         }
@@ -126,8 +124,8 @@ public void disconnect() {
         mIsConnected = false;
     }
 
-    int hrValue = 0;
-    long hrTimestamp = 0;
+    private int hrValue = 0;
+    private long hrTimestamp = 0;
 
     @Override
     public int getHRValue() {
diff --git a/hrdevice/src/org/runnerup/hr/RetryingHRProviderProxy.java b/hrdevice/src/org/runnerup/hr/RetryingHRProviderProxy.java
index 940e780fe..845818769 100644
--- a/hrdevice/src/org/runnerup/hr/RetryingHRProviderProxy.java
+++ b/hrdevice/src/org/runnerup/hr/RetryingHRProviderProxy.java
@@ -1,8 +1,6 @@
 package org.runnerup.hr;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
-import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 
@@ -19,7 +17,7 @@
  *   if loosing connection when connected,
  *   it will auto connect
  */
-@TargetApi(Build.VERSION_CODES.FROYO)
+
 public class RetryingHRProviderProxy implements HRProvider, HRProvider.HRClient {
 
     private HRDeviceRef connectRef;
@@ -38,8 +36,6 @@ enum State {
     }
 
     private int attempt = 0;
-    private final int kMaxConnectRetries = 3;
-    private final int kMaxReconnectRetires = 10;
     private final HRProvider provider;
     private HRClient client = null;
     private Handler handler = null;
@@ -58,18 +54,16 @@ private int getMaxRetries() {
             case ERROR:
                 return 0;
             case CONNECTING:
-                return kMaxConnectRetries;
+                return 3; //kMaxConnectRetries
             case RECONNECTING:
-                return kMaxReconnectRetires;
+                return 10; //kMaxReconnectRetries
         }
         return 0;
     }
 
     private boolean checkMaxAttempts() {
         attempt++;
-        if (attempt > getMaxRetries())
-            return false;
-        return true;
+        return attempt <= getMaxRetries();
     }
 
     private int getRetryDelayMillis() {
@@ -135,13 +129,12 @@ public void onOpenResult(boolean ok) {
             return;
         }
 
-        if (ok == true) {
+        if (ok) {
             state = State.OPENED;
-            client.onOpenResult(ok);
         } else {
             state = State.CLOSED;
-            client.onOpenResult(ok);
         }
+        client.onOpenResult(ok);
     }
 
     @Override
@@ -229,7 +222,6 @@ public void onConnectResult(boolean connectOK) {
                 log("client.onConnectResult(true)");
                 client.onConnectResult(true);
             }
-            return;
         } else {
             if (!checkMaxAttempts()) {
                 state = State.OPENED;
@@ -249,7 +241,6 @@ public void run() {
                 }
             }, delayMillis);
 
-            return;
         }
     }
 
@@ -319,7 +310,7 @@ public void log(HRProvider src, String msg) {
         log(msg);
     }
 
-    public void log(final String msg) {
+    private void log(final String msg) {
 
         String res = "[ RetryingHRProviderProxy: " +
                 provider.getProviderName() +
diff --git a/hrdevice/src/org/runnerup/hr/SamsungBLEHRProvider.java b/hrdevice/src/org/runnerup/hr/SamsungBLEHRProvider.java
index 813ae0166..467a81e01 100644
--- a/hrdevice/src/org/runnerup/hr/SamsungBLEHRProvider.java
+++ b/hrdevice/src/org/runnerup/hr/SamsungBLEHRProvider.java
@@ -47,8 +47,8 @@
 @TargetApi(Build.VERSION_CODES.HONEYCOMB)
 public class SamsungBLEHRProvider extends BtHRBase implements HRProvider {
 
-    static final String NAME = "SamsungBLE";
-    static final String DISPLAY_NAME = "Bluetooth SMART (BLE)";
+    private static final String NAME = "SamsungBLE";
+    private static final String DISPLAY_NAME = "Bluetooth SMART (BLE)";
 
     private final Context context;
     private BluetoothAdapter btAdapter = null;
@@ -216,17 +216,15 @@ public void onCharacteristicChanged(BluetoothGattCharacteristic arg0) {
         }
 
         private boolean isHeartRateInUINT16(byte b) {
-            if ((b & 1) != 0)
-                return true;
-            return false;
+            return (b & 1) != 0;
         }
 
         @Override
         public void onCharacteristicRead(BluetoothGattCharacteristic arg0, int arg1) {
             // triggered from DummyReadForSecLevelCheck
             UUID charUuid = arg0.getUuid();
-            if (charUuid.equals(FIRMWARE_REVISON_UUID)) {
-            } else if (charUuid.equals(BATTERY_LEVEL_CHARAC)) {
+            if (!charUuid.equals(FIRMWARE_REVISON_UUID) &&
+                    charUuid.equals(BATTERY_LEVEL_CHARAC)) {
                 batteryLevel = arg0.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT8, 0);
                 log("Battery level: " + batteryLevel);
             }
@@ -234,7 +232,6 @@ public void onCharacteristicRead(BluetoothGattCharacteristic arg0, int arg1) {
             log(" => startHR()");
             // triggered from DummyReadForSecLevelCheck
             startHR();
-            return;
         }
 
         private void startHR() {
@@ -255,9 +252,8 @@ private void startHR() {
                 reportConnectFailed("CCC for HEART RATE MEASUREMENT charateristic not found!");
                 return;
             }
-            if (btGatt.readDescriptor(mHRMccc) == false) {
+            if (!btGatt.readDescriptor(mHRMccc)) {
                 reportConnectFailed("readDescriptor() is failed");
-                return;
             }
             // Continue in onDescriptorRead
         }
@@ -269,9 +265,9 @@ public void onCharacteristicWrite(BluetoothGattCharacteristic arg0, int arg1) {
         @Override
         public void onConnectionStateChange(BluetoothDevice arg0, int status, int newState) {
 
-            if (btDevice != null && arg0 != null
-                    && btDevice.getAddress().contentEquals(arg0.getAddress())) {
-            }
+            //if (btDevice != null && arg0 != null
+            //        && btDevice.getAddress().contentEquals(arg0.getAddress())) {
+            //}
 
             if (btGatt == null) {
                 log("onConnectionStateChange: btGatt == null");
@@ -315,7 +311,7 @@ public void onScanResult(final BluetoothDevice arg0, int arg1, byte[] scanRecord
                     ", mIsConnecting: " + mIsConnecting + ", mIsScanning: " + mIsScanning);
 
             if (!broadcast) {
-                /**
+                /*
                  * If connect was called and btDevice was unknown, we scan for
                  * it before btGatt.connect()
                  */
@@ -381,15 +377,12 @@ private boolean checkIfBroadcastMode(byte[] scanRecord) {
                             // Since this data will be in Little endian format,
                             // we
                             // are interested in first 2 bits of first byte
-                            byte flag = scanRecord[offset++];
+                            @SuppressWarnings("UnusedAssignment") byte flag = scanRecord[offset++];
                             /*
                              * 00000011(0x03) - LE Limited Discoverable Mode and
                              * LE General Discoverable Mode
                              */
-                            if ((flag & LIMITED_AND_GENERAL_DISC_MASK) > 0)
-                                return false;
-                            else
-                                return true;
+                            return (flag & LIMITED_AND_GENERAL_DISC_MASK) <= 0;
                         } else if (len == 1) {
                             continue;// ignore that packet and continue with the
                                      // rest
@@ -432,7 +425,7 @@ private void DummyReadForSecLevelCheck(BluetoothDevice device) {
                 return;
             }
 
-            if (btGatt.readCharacteristic(firmwareIdCharc) == false) {
+            if (!btGatt.readCharacteristic(firmwareIdCharc)) {
                 reportConnectFailed("firmware revison reading is failed!");
             }
             // continue in onCharacteristicRead
@@ -460,6 +453,7 @@ private boolean readBatteryLevel(BluetoothDevice device) {
         // continue in onCharacteristicRead
     }
 
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     private boolean enableNotification(boolean onoff, BluetoothGattCharacteristic charac) {
         if (btGatt == null) {
             log("enableNotfication("+onoff+ ", " + charac + "): btGatt == null");
@@ -542,7 +536,7 @@ public void connect(HRDeviceRef ref) {
         btDevice = dev;
         if (ref.deviceName == null || dev.getName() == null ||
                 !ref.deviceName.contentEquals(dev.getName())) {
-            /**
+            /*
              * If device doesn't match name, scan for before connecting
              */
             log("Scan before connect");
@@ -583,7 +577,7 @@ public void disconnect() {
             return;
         }
 
-        if (mIsConnecting == false && mIsConnected == false)
+        if (!mIsConnecting && !mIsConnected)
             return;
 
         mIsConnected = false;
diff --git a/wear/build.gradle b/wear/build.gradle
index 827c3440f..bfd792412 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -39,8 +39,6 @@ android {
         checkReleaseBuilds true
         //promote to error
         fatal 'InlinedApi', 'InconsistentArrays'
-        //https://code.google.com/p/android/issues/detail?id=231325
-        warning 'GradleCompatible'
         // Ignore some specific checks completely
         ignore 'MissingTranslation', 'UnusedResources'
         //icon with all densities are not included - don't bother
@@ -62,8 +60,9 @@ repositories {
 dependencies {
     compile project(':common')
 
-    //Lint bug: https://code.google.com/p/android/issues/detail?id=231325
     compile "com.google.android.support:wearable:${rootProject.ext.googleWearVersion}"
+    //Implicit dependency https://issuetracker.google.com/issues/37131437 https://code.google.com/p/android/issues/detail?id=231325
+    provided "com.google.android.wearable:wearable:${rootProject.ext.googleWearVersion}"
     compile "com.google.android.gms:play-services-wearable:${rootProject.ext.googlePlayServicesVersion}"
 }
 
diff --git a/wear/lint-baseline.xml b/wear/lint-baseline.xml
index a1400ef9b..8396f159f 100644
--- a/wear/lint-baseline.xml
+++ b/wear/lint-baseline.xml
@@ -1,329 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 2.3.1">
-
-    <issue
-        id="GradleCompatible"
-        message="All com.android.support libraries must use the exact same version specification (mixing versions can lead to runtime crashes). Found versions 24.0.0, 23.0.1. Examples include `com.android.support:support-v4:24.0.0` and `com.android.support:percent:23.0.1`">
-        <location
-            file="build.gradle"/>
-    </issue>
-
-    <issue
-        id="GradleCompatible"
-        message="Project depends on com.google.android.support:wearable:2.0.0, so it must also depend (as a provided dependency) on com.google.android.wearable:wearable:2.0.0">
-        <location
-            file="build.gradle"/>
-    </issue>
-
-    <issue
-        id="GradleDependency"
-        message="A newer version of com.google.android.support:wearable than 2.0.0 is available: 2.0.4"
-        errorLine1="    compile &quot;com.google.android.support:wearable:${rootProject.ext.googleWearVersion}&quot;
"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="60"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="GradleDependency"
-        message="A newer version of com.google.android.gms:play-services-wearable than 10.2.0 is available: 11.0.4"
-        errorLine1="    compile &quot;com.google.android.gms:play-services-wearable:${rootProject.ext.googlePlayServicesVersion}&quot;
"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="build.gradle"
-            line="61"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="AllowBackup"
-        message="On SDK version 23 and up, your app data will be automatically backed up and restored on app install. Consider adding the attribute `android:fullBackupContent` to specify an `@xml` resource which configures which files to backup. More info: https://developer.android.com/training/backup/autosyncapi.html"
-        errorLine1="    &lt;application"
-        errorLine2="    ^">
-        <location
-            file="src\main\AndroidManifest.xml"
-            line="23"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="MergeRootFrame"
-        message="This `&lt;FrameLayout>` can be replaced with a `&lt;merge>` tag"
-        errorLine1="&lt;FrameLayout xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
-        errorLine2="^">
-        <location
-            file="src\main\res\layout\activity_main.xml"
-            line="18"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="UselessParent"
-        message="This `LinearLayout` layout or its `LinearLayout` parent is possibly useless; transfer the `background` attribute to the other view"
-        errorLine1="        &lt;LinearLayout"
-        errorLine2="        ^">
-        <location
-            file="src\main\res\layout\card1.xml"
-            line="32"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UselessParent"
-        message="This `LinearLayout` layout or its `FrameLayout` parent is useless"
-        errorLine1="        &lt;LinearLayout"
-        errorLine2="        ^">
-        <location
-            file="src\main\res\layout\connect_to_phone.xml"
-            line="32"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UselessParent"
-        message="This `LinearLayout` layout or its `FrameLayout` parent is useless"
-        errorLine1="        &lt;LinearLayout"
-        errorLine2="        ^">
-        <location
-            file="src\main\res\layout\newlap.xml"
-            line="32"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UselessParent"
-        message="This `LinearLayout` layout or its `FrameLayout` parent is useless"
-        errorLine1="        &lt;LinearLayout"
-        errorLine2="        ^">
-        <location
-            file="src\main\res\layout\pause_resume.xml"
-            line="32"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UselessParent"
-        message="This `LinearLayout` layout or its `FrameLayout` parent is useless"
-        errorLine1="        &lt;LinearLayout"
-        errorLine2="        ^">
-        <location
-            file="src\main\res\layout\searching.xml"
-            line="32"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UselessParent"
-        message="This `LinearLayout` layout or its `FrameLayout` parent is useless"
-        errorLine1="        &lt;LinearLayout"
-        errorLine2="        ^">
-        <location
-            file="src\main\res\layout\start.xml"
-            line="32"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="UselessParent"
-        message="This `LinearLayout` layout or its `FrameLayout` parent is useless"
-        errorLine1="        &lt;LinearLayout"
-        errorLine2="        ^">
-        <location
-            file="src\main\res\layout\stopped.xml"
-            line="32"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="IconLocation"
-        message="Found bitmap drawable `res/drawable/heart16.png` in densityless folder">
-        <location
-            file="src\main\res\drawable\heart16.png"/>
-    </issue>
-
-    <issue
-        id="IconLocation"
-        message="Found bitmap drawable `res/drawable/ic_launcher.png` in densityless folder">
-        <location
-            file="src\main\res\drawable\ic_launcher.png"/>
-    </issue>
-
-    <issue
-        id="GoogleAppIndexingWarning"
-        message="App is not indexable by Google Search; consider adding at least one Activity with an ACTION-VIEW intent filter. See issue explanation for more details."
-        errorLine1="    &lt;application"
-        errorLine2="    ^">
-        <location
-            file="src\main\AndroidManifest.xml"
-            line="23"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="HardcodedText"
-        message="[I18N] Hardcoded string &quot;time&quot;, should use `@string` resource"
-        errorLine1="                    android:text=&quot;time&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\card1.xml"
-            line="43"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="HardcodedText"
-        message="[I18N] Hardcoded string &quot;--:--&quot;, should use `@string` resource"
-        errorLine1="                    android:text=&quot;--:--&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\card1.xml"
-            line="48"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="HardcodedText"
-        message="[I18N] Hardcoded string &quot;time&quot;, should use `@string` resource"
-        errorLine1="                    android:text=&quot;time&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\card2.xml"
-            line="43"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="HardcodedText"
-        message="[I18N] Hardcoded string &quot;--:--&quot;, should use `@string` resource"
-        errorLine1="                    android:text=&quot;--:--&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\card2.xml"
-            line="48"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="HardcodedText"
-        message="[I18N] Hardcoded string &quot;lap pace&quot;, should use `@string` resource"
-        errorLine1="                android:text=&quot;lap pace&quot;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\card2.xml"
-            line="64"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="HardcodedText"
-        message="[I18N] Hardcoded string &quot;-:--&quot;, should use `@string` resource"
-        errorLine1="                android:text=&quot;-:--&quot;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\card2.xml"
-            line="69"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="HardcodedText"
-        message="[I18N] Hardcoded string &quot;distance&quot;, should use `@string` resource"
-        errorLine1="                android:text=&quot;distance&quot;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\card3.xml"
-            line="42"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="HardcodedText"
-        message="[I18N] Hardcoded string &quot;-.--&quot;, should use `@string` resource"
-        errorLine1="                android:text=&quot;-.--&quot;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\card3.xml"
-            line="47"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="HardcodedText"
-        message="[I18N] Hardcoded string &quot;time&quot;, should use `@string` resource"
-        errorLine1="                    android:text=&quot;time&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\card3.xml"
-            line="63"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="HardcodedText"
-        message="[I18N] Hardcoded string &quot;--:--&quot;, should use `@string` resource"
-        errorLine1="                    android:text=&quot;--:--&quot;"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\card3.xml"
-            line="68"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="HardcodedText"
-        message="[I18N] Hardcoded string &quot;lap pace&quot;, should use `@string` resource"
-        errorLine1="                android:text=&quot;lap pace&quot;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\card3.xml"
-            line="84"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="HardcodedText"
-        message="[I18N] Hardcoded string &quot;-:--&quot;, should use `@string` resource"
-        errorLine1="                android:text=&quot;-:--&quot;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\card3.xml"
-            line="89"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="        android:layout_gravity=&quot;center_vertical|right&quot;"
-        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\activity_main.xml"
-            line="32"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`start`&quot; instead of &quot;`left`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:layout_gravity=&quot;left|center&quot;"
-        errorLine2="                                    ~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\newlap_pause_resume.xml"
-            line="35"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="RtlHardcoded"
-        message="Use &quot;`end`&quot; instead of &quot;`right`&quot; to ensure correct behavior in right-to-left locales"
-        errorLine1="            android:layout_gravity=&quot;right|center&quot;"
-        errorLine2="                                    ~~~~~~~~~~~~">
-        <location
-            file="src\main\res\layout\newlap_pause_resume.xml"
-            line="61"
-            column="37"/>
-    </issue>
-
+<issues format="4" by="lint 3.0.0-alpha9">
 </issues>
diff --git a/wear/lint.xml b/wear/lint.xml
index af65acec3..88ae0092b 100644
--- a/wear/lint.xml
+++ b/wear/lint.xml
@@ -19,4 +19,6 @@
     <issue id="WrongRegion" severity="ignore">
         <ignore regexp="^.*?\Q\res\values-en-rNL\\E.*?$" />
     </issue>
+    <issue id="AllowBackup" severity="ignore"/>
+    <issue id="GradleCompatible" severity="ignore"/>
 </lint>
\ No newline at end of file
diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index 4ccfe30b9..389c3496f 100644
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="org.runnerup" >
 
     <uses-feature android:name="android.hardware.type.watch" />
@@ -25,9 +26,12 @@
         android:theme="@android:style/Theme.Black"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:keepScreenOn="true">
+        android:keepScreenOn="true"
+        android:supportsRtl="true"
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
 
         <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
+        <meta-data android:name="com.google.android.wearable.standalone" android:value="false"/>
 
         <activity
             android:name=".view.MainActivity" >
@@ -49,8 +53,8 @@
             </intent-filter>
         </service>
 
-        <service android:name=".service.StateService"></service>
+        <service android:name=".service.StateService" />
 
-</application>
+    </application>
 
 </manifest>
diff --git a/wear/src/main/java/org/runnerup/service/ListenerService.java b/wear/src/main/java/org/runnerup/service/ListenerService.java
index d7e267fc7..1f2c533ab 100644
--- a/wear/src/main/java/org/runnerup/service/ListenerService.java
+++ b/wear/src/main/java/org/runnerup/service/ListenerService.java
@@ -16,11 +16,9 @@
  */
 package org.runnerup.service;
 
-import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Intent;
-import android.os.Build;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationManagerCompat;
 
@@ -32,10 +30,10 @@
 import org.runnerup.common.util.Constants;
 import org.runnerup.view.MainActivity;
 
-@TargetApi(Build.VERSION_CODES.KITKAT_WATCH)
+
 public class ListenerService extends WearableListenerService {
 
-    private int notificationId = 10;
+    private final int notificationId = 10;
 
     @Override
     public void onCreate() {
diff --git a/wear/src/main/java/org/runnerup/service/StateService.java b/wear/src/main/java/org/runnerup/service/StateService.java
index 28ae83d98..d3417b4d1 100644
--- a/wear/src/main/java/org/runnerup/service/StateService.java
+++ b/wear/src/main/java/org/runnerup/service/StateService.java
@@ -16,13 +16,12 @@
  */
 package org.runnerup.service;
 
-import android.annotation.TargetApi;
 import android.app.Service;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.support.annotation.NonNull;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.api.GoogleApiClient;
@@ -50,7 +49,7 @@
 
 import static com.google.android.gms.wearable.PutDataRequest.WEAR_URI_SCHEME;
 
-@TargetApi(Build.VERSION_CODES.KITKAT_WATCH)
+
 public class StateService extends Service implements NodeApi.NodeListener, MessageApi.MessageListener, DataApi.DataListener, ValueModel.ChangeListener<Bundle> {
 
     public static final String UPDATE_TIME = "UPDATE_TIME";
@@ -58,12 +57,12 @@ public class StateService extends Service implements NodeApi.NodeListener, Messa
     private final IBinder mBinder = new LocalBinder();
     private GoogleApiClient mGoogleApiClient;
     @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
-    private final HashSet<Node> connectedNodes = new HashSet<Node>();
+    private final HashSet<Node> connectedNodes = new HashSet<>();
 
     private String phoneNode;
 
     private Bundle data;
-    private final ValueModel<TrackerState> trackerState = new ValueModel<TrackerState>();
+    private final ValueModel<TrackerState> trackerState = new ValueModel<>();
     private final ValueModel<Bundle> headers = new ValueModel<>();
     private MainActivity headersListener;
 
@@ -86,11 +85,11 @@ public void onConnected(Bundle connectionHint) {
                         /* read already existing data */
                         readData();
 
-                        /** get info about connected nodes in background */
+                        /* get info about connected nodes in background */
                         Wearable.NodeApi.getConnectedNodes(mGoogleApiClient).setResultCallback(
                                 new ResultCallback<NodeApi.GetConnectedNodesResult>() {
                                     @Override
-                                    public void onResult(NodeApi.GetConnectedNodesResult nodes) {
+                                    public void onResult(@NonNull NodeApi.GetConnectedNodesResult nodes) {
                                         System.err.println("onGetConnectedNodes");
                                         for (Node n : nodes.getNodes()) {
                                             onPeerConnected(n);
@@ -105,7 +104,7 @@ public void onConnectionSuspended(int cause) {
                 })
                 .addOnConnectionFailedListener(new GoogleApiClient.OnConnectionFailedListener() {
                     @Override
-                    public void onConnectionFailed(ConnectionResult result) {
+                    public void onConnectionFailed(@NonNull ConnectionResult result) {
                     }
                 })
                 .addApi(Wearable.API)
@@ -116,6 +115,7 @@ public void onConnectionFailed(ConnectionResult result) {
         System.err.println("StateService.onCreate()");
     }
 
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     private boolean checkConnection() {
         return mGoogleApiClient != null && mGoogleApiClient.isConnected();
     }
@@ -126,7 +126,7 @@ private void readData() {
                 .setResultCallback(
                         new ResultCallback<DataItemBuffer>() {
                             @Override
-                            public void onResult(DataItemBuffer dataItems) {
+                            public void onResult(@NonNull DataItemBuffer dataItems) {
                                 for (DataItem dataItem : dataItems) {
                                     phoneNode = dataItem.getUri().getHost();
                                     System.err.println("getDataItem => phoneNode:" + phoneNode);
@@ -139,7 +139,7 @@ public void onResult(DataItemBuffer dataItems) {
                 .setResultCallback(
                         new ResultCallback<DataItemBuffer>() {
                             @Override
-                            public void onResult(DataItemBuffer dataItems) {
+                            public void onResult(@NonNull DataItemBuffer dataItems) {
                                 for (DataItem dataItem : dataItems) {
                                     TrackerState newState = getTrackerStateFromDataItem(dataItem);
                                     if (newState != null)
@@ -153,7 +153,7 @@ public void onResult(DataItemBuffer dataItems) {
                 .setResultCallback(
                         new ResultCallback<DataItemBuffer>() {
                             @Override
-                            public void onResult(DataItemBuffer dataItems) {
+                            public void onResult(@NonNull DataItemBuffer dataItems) {
                                 for (DataItem dataItem : dataItems) {
                                     Bundle b = DataMapItem.fromDataItem(dataItem).getDataMap().toBundle();
                                     b.putLong(UPDATE_TIME, System.currentTimeMillis());
@@ -205,7 +205,7 @@ public IBinder onBind(Intent intent) {
     @Override
     public void onValueChanged(ValueModel<Bundle> instance, Bundle oldValue, Bundle newValue) {
         if (headersListener != null)
-            headersListener.onValueChanged(oldValue, newValue);
+            headersListener.onValueChanged(newValue);
     }
 
     public class LocalBinder extends android.os.Binder {
@@ -214,7 +214,7 @@ public StateService getService() {
         }
     }
 
-    Bundle getBundle(Bundle src, long lastUpdateTime) {
+    private Bundle getBundle(Bundle src, long lastUpdateTime) {
         if (src == null)
             return null;
 
@@ -274,7 +274,7 @@ public void onDataChanged(DataEventBuffer dataEvents) {
         }
     }
 
-    public void setPhoneNode(DataEvent ev) {
+    private void setPhoneNode(DataEvent ev) {
         if (ev.getType() == DataEvent.TYPE_CHANGED) {
             phoneNode = new String(ev.getDataItem().getData());
         } else if (ev.getType() == DataEvent.TYPE_DELETED) {
@@ -295,7 +295,7 @@ private void setHeaders(DataEvent ev) {
         }
     }
 
-    static TrackerState getTrackerStateFromDataItem(DataItem dataItem) {
+    private static TrackerState getTrackerStateFromDataItem(DataItem dataItem) {
         if (!dataItem.isDataValid())
             return null;
 
diff --git a/wear/src/main/java/org/runnerup/view/ConnectToPhoneFragment.java b/wear/src/main/java/org/runnerup/view/ConnectToPhoneFragment.java
index 3cd5420f0..eb6a201bb 100644
--- a/wear/src/main/java/org/runnerup/view/ConnectToPhoneFragment.java
+++ b/wear/src/main/java/org/runnerup/view/ConnectToPhoneFragment.java
@@ -16,16 +16,13 @@
  */
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.Fragment;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.wearable.view.DelayedConfirmationView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import org.runnerup.R;
 import org.runnerup.common.tracker.TrackerState;
@@ -34,27 +31,21 @@
 /**
  * @todo make this fragment contact phone and start app
  */
-@TargetApi(Build.VERSION_CODES.KITKAT_WATCH)
+
 public class ConnectToPhoneFragment extends Fragment implements ValueModel.ChangeListener<TrackerState> {
 
-    private TextView mTxt;
     private DelayedConfirmationView mButton;
     private MainActivity activity;
     public ConnectToPhoneFragment() {
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.connect_to_phone, container, false);
         super.onViewCreated(view, savedInstanceState);
 
         mButton = (DelayedConfirmationView) view.findViewById(R.id.icon_open_on_phone);
-        mTxt = (TextView) view.findViewById(R.id.txt_open_on_phone);
+        //TextView txt = (TextView) view.findViewById(R.id.txt_open_on_phone);
 
         mButton.setListener(mListener);
 
@@ -95,7 +86,7 @@ public void onValueChanged(ValueModel<TrackerState> obj,
             updateView(newState);
     }
 
-    private DelayedConfirmationView.DelayedConfirmationListener mListener = new DelayedConfirmationView.DelayedConfirmationListener() {
+    private final DelayedConfirmationView.DelayedConfirmationListener mListener = new DelayedConfirmationView.DelayedConfirmationListener() {
         @Override
         public void onTimerFinished(View view) {
             updateView(activity.getTrackerState());
diff --git a/wear/src/main/java/org/runnerup/view/CountdownFragment.java b/wear/src/main/java/org/runnerup/view/CountdownFragment.java
index 1ff350de5..2c9ee493f 100644
--- a/wear/src/main/java/org/runnerup/view/CountdownFragment.java
+++ b/wear/src/main/java/org/runnerup/view/CountdownFragment.java
@@ -16,10 +16,8 @@
  */
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.Fragment;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Pair;
@@ -35,14 +33,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@TargetApi(Build.VERSION_CODES.KITKAT_WATCH)
+
 public class CountdownFragment extends Fragment {
 
-    long dataUpdateTime;
-    List<Pair<String, TextView>> textViews = new ArrayList<Pair<String, TextView>>(3);
-    Handler handler = new Handler();
-    boolean handlerOutstanding = false;
-    Runnable periodicTick = new Runnable() {
+    private long dataUpdateTime;
+    private final List<Pair<String, TextView>> textViews = new ArrayList<>(3);
+    private final Handler handler = new Handler();
+    private boolean handlerOutstanding = false;
+    private final Runnable periodicTick = new Runnable() {
         @Override
         public void run() {
             update();
@@ -58,20 +56,15 @@ public CountdownFragment() {
         super();
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.countdown, container, false);
-        textViews.add(new Pair<String, TextView>(Constants.Wear.RunInfo.COUNTDOWN,
+        textViews.add(new Pair<>(Constants.Wear.RunInfo.COUNTDOWN,
                 (TextView) view.findViewById(R.id.countdown_txt)));
         return view;
     }
 
-    void startTimer() {
+    private void startTimer() {
         if (handlerOutstanding)
             return;
         handlerOutstanding = true;
@@ -106,11 +99,6 @@ public void onResume() {
         update();
     }
 
-    @Override
-    public void onPause() {
-        super.onPause();
-    }
-
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
diff --git a/wear/src/main/java/org/runnerup/view/MainActivity.java b/wear/src/main/java/org/runnerup/view/MainActivity.java
index 7b5ea05b6..654438340 100644
--- a/wear/src/main/java/org/runnerup/view/MainActivity.java
+++ b/wear/src/main/java/org/runnerup/view/MainActivity.java
@@ -16,7 +16,6 @@
  */
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentManager;
@@ -25,7 +24,6 @@
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.graphics.Point;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -40,15 +38,13 @@
 import org.runnerup.common.util.ValueModel;
 import org.runnerup.service.StateService;
 import org.runnerup.widget.MyDotsPageIndicator;
-
 import java.util.ArrayList;
 
-@TargetApi(Build.VERSION_CODES.KITKAT_WATCH)
 public class MainActivity extends Activity implements Constants, ValueModel.ChangeListener<TrackerState> {
-    private Handler handler = new Handler();
+    private final Handler handler = new Handler();
     private GridViewPager pager;
     private StateService mStateService;
-    final private ValueModel<TrackerState> trackerState = new ValueModel<TrackerState>();
+    final private ValueModel<TrackerState> trackerState = new ValueModel<>();
     final private ValueModel<Bundle> headers = new ValueModel<>();
     private boolean pauseStep = false;
     private int scroll = 0;
@@ -77,11 +73,6 @@ protected void onCreate(Bundle savedInstanceState) {
         dot2.setPager(pager);
     }
 
-    @Override
-    protected void onStart() {
-        super.onStart();
-    }
-
     @Override
     protected void onResume() {
         super.onResume();
@@ -100,19 +91,12 @@ protected void onPause() {
         mStateService = null;
     }
 
-    @Override
-    protected void onStop() {
-        super.onStop();
-    }
-
     private class PagerAdapter extends FragmentGridPagerAdapter
             implements ValueModel.ChangeListener<TrackerState> {
-        int currentRow = 0;
-        int currentCol = 0;
         int rows = 1;
         int cols = 1;
 
-        public PagerAdapter(FragmentManager fm) {
+        PagerAdapter(FragmentManager fm) {
             super(fm);
             update(trackerState.get());
             trackerState.registerChangeListener(this);
@@ -125,8 +109,6 @@ public Fragment getFragment(int row, int col) {
             else if (mStateService == null)
                 return new ConnectToPhoneFragment();
 
-            currentRow = row;
-            currentCol = col;
             switch (trackerState.get()) {
                 case INIT:
                 case INITIALIZING:
@@ -262,7 +244,7 @@ public void scrollToRunInfo() {
         pager.setCurrentItem(RUN_INFO_ROW, curr.x, true);
     }
 
-    public void scrollRight() {
+    private void scrollRight() {
         Point curr = pager.getCurrentItem();
         if (curr.y != RUN_INFO_ROW)
             return;
@@ -272,7 +254,7 @@ public void scrollRight() {
         pager.setCurrentItem(curr.y, newx, true);
     }
 
-    private ServiceConnection mStateServiceConnection = new ServiceConnection() {
+    private final ServiceConnection mStateServiceConnection = new ServiceConnection() {
         @Override
         public void onServiceConnected(ComponentName name, IBinder service) {
             if (mStateService == null) {
@@ -323,7 +305,7 @@ public void unregisterTrackerStateListener(ValueModel.ChangeListener<TrackerStat
         }
     }
 
-    void postScrollRight() {
+    private void postScrollRight() {
         if (postScrollRightRunning)
             return;
         if (scroll > 0 && getScreensCount() > 1) {
@@ -344,7 +326,7 @@ public void run() {
         }
     }
 
-    public void onValueChanged(final Bundle oldValue, final Bundle newValue) {
+    public void onValueChanged(final Bundle newValue) {
         synchronized (trackerState) {
             runOnUiThread(new Runnable() {
                 @Override
diff --git a/wear/src/main/java/org/runnerup/view/PauseResumeFragment.java b/wear/src/main/java/org/runnerup/view/PauseResumeFragment.java
index cf54e2f2e..5b05eca08 100644
--- a/wear/src/main/java/org/runnerup/view/PauseResumeFragment.java
+++ b/wear/src/main/java/org/runnerup/view/PauseResumeFragment.java
@@ -16,10 +16,8 @@
  */
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.Fragment;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.wearable.view.CircledImageView;
@@ -32,14 +30,13 @@
 import org.runnerup.common.tracker.TrackerState;
 import org.runnerup.common.util.ValueModel;
 
-@TargetApi(Build.VERSION_CODES.KITKAT_WATCH)
+
 public class PauseResumeFragment extends Fragment implements ValueModel.ChangeListener<TrackerState> {
 
     private static final long SCROLL_DELAY = 1500; // 1.5s
-    private Handler handler = new Handler();
+    private final Handler handler = new Handler();
     private TextView mButtonPauseResumeTxt;
     private CircledImageView mButtonPauseResume;
-    private TextView mButtonNewLapTxt;
     private CircledImageView mButtonNewLap;
     private MainActivity activity;
     private long clickCount = 0;
@@ -47,11 +44,6 @@ public class PauseResumeFragment extends Fragment implements ValueModel.ChangeLi
     public PauseResumeFragment() {
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.newlap_pause_resume, container, false);
@@ -62,7 +54,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         mButtonPauseResumeTxt = (TextView) view.findViewById(R.id.txt_resume);
         mButtonNewLap = (CircledImageView) view.findViewById(R.id.icon_newlap);
         mButtonNewLap.setOnClickListener(newLapButtonClick);
-        mButtonNewLapTxt = (TextView) view.findViewById(R.id.txt_newlap);
+        //TextView buttonNewLapTxt = (TextView) view.findViewById(R.id.txt_newlap);
 
         return view;
     }
@@ -96,7 +88,7 @@ private void updateView(TrackerState state) {
         mButtonPauseResume.setEnabled(false);
     }
 
-    private View.OnClickListener pauseButtonClick = new View.OnClickListener() {
+    private final View.OnClickListener pauseButtonClick = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
             clickCount++;
@@ -120,7 +112,7 @@ public void run() {
         }
     };
 
-    private View.OnClickListener newLapButtonClick = new View.OnClickListener() {
+    private final View.OnClickListener newLapButtonClick = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
             clickCount++;
diff --git a/wear/src/main/java/org/runnerup/view/RunInfoFragment.java b/wear/src/main/java/org/runnerup/view/RunInfoFragment.java
index 8537e5f5d..462e8dd77 100644
--- a/wear/src/main/java/org/runnerup/view/RunInfoFragment.java
+++ b/wear/src/main/java/org/runnerup/view/RunInfoFragment.java
@@ -16,10 +16,8 @@
  */
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.Fragment;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Pair;
@@ -39,17 +37,17 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@TargetApi(Build.VERSION_CODES.KITKAT_WATCH)
+
 public class RunInfoFragment extends Fragment implements ValueModel.ChangeListener<TrackerState> {
 
-    List<Pair<String, TextView>> textViews = new ArrayList<Pair<String, TextView>>(3);
-    int screen;
-    int rowsOnScreen;
-    long dataUpdateTime;
-    long headersTimestamp;
-    Handler handler = new Handler();
-    boolean handlerOutstanding = false;
-    Runnable periodicTick = new Runnable() {
+    private final List<Pair<String, TextView>> textViews = new ArrayList<>(3);
+    private int screen;
+    private int rowsOnScreen;
+    private long dataUpdateTime;
+    private long headersTimestamp;
+    private final Handler handler = new Handler();
+    private boolean handlerOutstanding = false;
+    private final Runnable periodicTick = new Runnable() {
         @Override
         public void run() {
             update();
@@ -61,15 +59,15 @@ public void run() {
     };
     private MainActivity mainActivity;
 
-    static final int card1ids[] = new int[]{
+    private static final int[] card1ids = new int[]{
             R.id.textView11,
             R.id.textViewHeader11,
     };
-    static final int card2ids[] = new int[]{
+    private static final int[] card2ids = new int[]{
             R.id.textView21, R.id.textView22,
             R.id.textViewHeader21, R.id.textViewHeader22
     };
-    static final int card3ids[] = new int[]{
+    private static final int[] card3ids = new int[]{
             R.id.textView31, R.id.textView32, R.id.textView33,
             R.id.textViewHeader31, R.id.textViewHeader32, R.id.textViewHeader33
     };
@@ -85,11 +83,6 @@ public RunInfoFragment() {
         super();
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
@@ -111,19 +104,19 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         }
         View view = inflater.inflate(card, container, false);
         for (int i = 0; i < rowsOnScreen; i++) {
-            textViews.add(new Pair<String, TextView>(Constants.Wear.RunInfo.DATA +
+            textViews.add(new Pair<>(Constants.Wear.RunInfo.DATA +
                     Integer.toString(screen) + "." + Integer.toString(i),
                     (TextView) view.findViewById(ids[i])));
         }
         for (int i = 0; i < rowsOnScreen; i++) {
-            textViews.add(new Pair<String, TextView>(Constants.Wear.RunInfo.HEADER +
+            textViews.add(new Pair<>(Constants.Wear.RunInfo.HEADER +
                     Integer.toString(screen) + "." + Integer.toString(i),
                     (TextView) view.findViewById(ids[rowsOnScreen + i])));
         }
         return view;
     }
 
-    void startTimer() {
+    private void startTimer() {
         if (handlerOutstanding)
             return;
         handlerOutstanding = true;
diff --git a/wear/src/main/java/org/runnerup/view/SearchingFragment.java b/wear/src/main/java/org/runnerup/view/SearchingFragment.java
index ed868b287..74328f465 100644
--- a/wear/src/main/java/org/runnerup/view/SearchingFragment.java
+++ b/wear/src/main/java/org/runnerup/view/SearchingFragment.java
@@ -16,8 +16,6 @@
  */
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
-import android.app.Activity;
 import android.app.Fragment;
 import android.graphics.drawable.AnimationDrawable;
 import android.os.Build;
@@ -29,47 +27,29 @@
 
 import org.runnerup.R;
 
-//@TargetApi(Build.VERSION_CODES.KITKAT_WATCH)
+//
 public class SearchingFragment extends Fragment {
 
-    private CircledImageView mButton;
-    private MainActivity activity;
-
     public SearchingFragment() {
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.searching, container, false);
         super.onViewCreated(view, savedInstanceState);
 
         if (Build.VERSION.SDK_INT >= 23) {
-            mButton = (CircledImageView) view.findViewById(R.id.icon_searching);
-            AnimationDrawable frameAnimation = (AnimationDrawable) mButton.getForeground();
+            CircledImageView button = (CircledImageView) view.findViewById(R.id.icon_searching);
+            AnimationDrawable frameAnimation = (AnimationDrawable) button.getForeground();
             frameAnimation.start();
         }
 
         return view;
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-    }
-
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-        this.activity = (MainActivity) activity;
-    }
+    //@Override
+    //public void onAttach(Activity activity) {
+    //    super.onAttach(activity);
+    //    //MainActivity activity1 = (MainActivity) activity;
+    //}
 }
diff --git a/wear/src/main/java/org/runnerup/view/StartFragment.java b/wear/src/main/java/org/runnerup/view/StartFragment.java
index 634d62a4d..5ecd0ae58 100644
--- a/wear/src/main/java/org/runnerup/view/StartFragment.java
+++ b/wear/src/main/java/org/runnerup/view/StartFragment.java
@@ -16,10 +16,8 @@
  */
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.Fragment;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.wearable.view.CircledImageView;
 import android.view.LayoutInflater;
@@ -31,28 +29,22 @@
 import org.runnerup.common.tracker.TrackerState;
 import org.runnerup.common.util.ValueModel;
 
-@TargetApi(Build.VERSION_CODES.KITKAT_WATCH)
+
 public class StartFragment extends Fragment implements ValueModel.ChangeListener<TrackerState> {
 
     private TextView mTxt;
-    private CircledImageView mButton;
     private MainActivity activity;
 
     public StartFragment() {
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.start, container, false);
         super.onViewCreated(view, savedInstanceState);
 
-        mButton = (CircledImageView) view.findViewById(R.id.icon_start);
-        mButton.setOnClickListener(startButtonClick);
+        CircledImageView button = (CircledImageView) view.findViewById(R.id.icon_start);
+        button.setOnClickListener(startButtonClick);
         mTxt = (TextView) view.findViewById(R.id.txt_start);
 
         return view;
@@ -83,7 +75,7 @@ private void updateView(TrackerState state) {
         }
     }
 
-    private View.OnClickListener startButtonClick = new View.OnClickListener() {
+    private final View.OnClickListener startButtonClick = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
             activity.getStateService().sendStart();
diff --git a/wear/src/main/java/org/runnerup/view/StoppedFragment.java b/wear/src/main/java/org/runnerup/view/StoppedFragment.java
index 4241e9bf2..44c965f91 100644
--- a/wear/src/main/java/org/runnerup/view/StoppedFragment.java
+++ b/wear/src/main/java/org/runnerup/view/StoppedFragment.java
@@ -16,9 +16,7 @@
  */
 package org.runnerup.view;
 
-import android.annotation.TargetApi;
 import android.app.Fragment;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -26,17 +24,12 @@
 
 import org.runnerup.R;
 
-@TargetApi(Build.VERSION_CODES.KITKAT_WATCH)
+
 public class StoppedFragment extends Fragment {
 
     public StoppedFragment() {
     }
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.stopped, container, false);
diff --git a/wear/src/main/java/org/runnerup/widget/MyDotsPageIndicator.java b/wear/src/main/java/org/runnerup/widget/MyDotsPageIndicator.java
index d67037906..be0bf8cec 100644
--- a/wear/src/main/java/org/runnerup/widget/MyDotsPageIndicator.java
+++ b/wear/src/main/java/org/runnerup/widget/MyDotsPageIndicator.java
@@ -16,9 +16,7 @@
  */
 package org.runnerup.widget;
 
-import android.annotation.TargetApi;
 import android.graphics.Point;
-import android.os.Build;
 import android.support.wearable.view.GridPagerAdapter;
 import android.support.wearable.view.GridViewPager;
 import android.util.TypedValue;
@@ -28,17 +26,14 @@
 
 import org.runnerup.R;
 
-/**
- * Created by jonas on 12/27/14.
- */
-@TargetApi(Build.VERSION_CODES.KITKAT_WATCH)
+
 public class MyDotsPageIndicator implements GridViewPager.OnPageChangeListener, GridViewPager.OnAdapterChangeListener {
 
     // margin, size
-    private Point unselected = new Point(4,2);
-    private Point selected = new Point(6,1);
+    private final Point unselected = new Point(4,2);
+    private final Point selected = new Point(6,1);
 
-    private LinearLayout layout;
+    private final LinearLayout layout;
     private GridViewPager pager;
 
     public MyDotsPageIndicator(LinearLayout layout) {
diff --git a/wear/src/main/res/drawable/ic_launcher.png b/wear/src/main/res/drawable-nodpi/ic_launcher.png
similarity index 100%
rename from wear/src/main/res/drawable/ic_launcher.png
rename to wear/src/main/res/drawable-nodpi/ic_launcher.png
diff --git a/wear/src/main/res/drawable/circle.xml b/wear/src/main/res/drawable/circle.xml
deleted file mode 100644
index 34a30f6db..000000000
--- a/wear/src/main/res/drawable/circle.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 jonas.oreland@gmail.com
-  ~
-  ~  This program is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 3 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  This program is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-
-    <solid android:color="@color/action_button" />
-
-    <size
-        android:width="256dp"
-        android:height="256dp" />
-</shape>
diff --git a/wear/src/main/res/drawable/heart16.png b/wear/src/main/res/drawable/heart16.png
deleted file mode 100644
index bdecd5023..000000000
Binary files a/wear/src/main/res/drawable/heart16.png and /dev/null differ
diff --git a/wear/src/main/res/drawable/searching_animation.xml b/wear/src/main/res/drawable/searching_animation.xml
index 9d7d2f8aa..4e67a33d1 100644
--- a/wear/src/main/res/drawable/searching_animation.xml
+++ b/wear/src/main/res/drawable/searching_animation.xml
@@ -16,7 +16,6 @@
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <animation-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/selected"
     android:oneshot="false" >
 
     <item
diff --git a/wear/src/main/res/layout/activity_main.xml b/wear/src/main/res/layout/activity_main.xml
index 42638f97e..8a30ea70b 100644
--- a/wear/src/main/res/layout/activity_main.xml
+++ b/wear/src/main/res/layout/activity_main.xml
@@ -15,7 +15,7 @@
   ~  You should have received a copy of the GNU General Public License
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -29,7 +29,7 @@
         android:id="@+id/vert_page_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical|right"
+        android:layout_gravity="center_vertical|end"
         android:orientation="vertical">
 
         <Button
@@ -76,4 +76,4 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|bottom" />
 
-</FrameLayout>
+</merge>
diff --git a/wear/src/main/res/layout/card1.xml b/wear/src/main/res/layout/card1.xml
index 7c39c9aa9..be88b3f3f 100644
--- a/wear/src/main/res/layout/card1.xml
+++ b/wear/src/main/res/layout/card1.xml
@@ -17,19 +17,12 @@
   -->
 
 <android.support.wearable.view.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="0dp">
 
     <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_gravity="center"
-        android:gravity="center"
-        >
-
-        <LinearLayout
             android:id="@+id/layout1"
             android:orientation="vertical"
             android:layout_width="fill_parent"
@@ -40,16 +33,15 @@
 
                 <TextView
                     android:id="@+id/textViewHeader11"
-                    android:text="time"
+                    android:text="@string/time"
                     style="@style/Card1TextSmall" />
 
                 <TextView
                     android:id="@+id/textView11"
                     android:text="--:--"
+                    tools:ignore="HardcodedText"
                     style="@style/Card1TextLarge" />
 
-        </LinearLayout>
-
     </LinearLayout>
 
 </android.support.wearable.view.BoxInsetLayout>
diff --git a/wear/src/main/res/layout/card2.xml b/wear/src/main/res/layout/card2.xml
index d122c1086..91fa52da5 100644
--- a/wear/src/main/res/layout/card2.xml
+++ b/wear/src/main/res/layout/card2.xml
@@ -17,6 +17,7 @@
   -->
 
 <android.support.wearable.view.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="0dp">
@@ -40,12 +41,13 @@
 
                 <TextView
                     android:id="@+id/textViewHeader21"
-                    android:text="time"
+                    android:text="@string/time"
                     style="@style/Card2TextSmall" />
 
                 <TextView
                     android:id="@+id/textView21"
                     android:text="--:--"
+                    tools:ignore="HardcodedText"
                     style="@style/Card2TextLarge" />
 
         </LinearLayout>
@@ -61,12 +63,13 @@
 
             <TextView
                 android:id="@+id/textViewHeader22"
-                android:text="lap pace"
+                android:text="@string/Lap_pace"
                 style="@style/Card2TextSmall" />
 
             <TextView
                 android:id="@+id/textView22"
                 android:text="-:--"
+                tools:ignore="HardcodedText"
                 style="@style/Card2TextMedium" />
 
         </LinearLayout>
diff --git a/wear/src/main/res/layout/card3.xml b/wear/src/main/res/layout/card3.xml
index ed953c72b..e2cf7b298 100644
--- a/wear/src/main/res/layout/card3.xml
+++ b/wear/src/main/res/layout/card3.xml
@@ -17,6 +17,7 @@
   -->
 
 <android.support.wearable.view.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="0dp">
@@ -30,7 +31,6 @@
         >
 
         <LinearLayout
-            android:id="@+id/layout2"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -39,18 +39,18 @@
 
             <TextView
                 android:id="@+id/textViewHeader32"
-                android:text="distance"
+                android:text="@string/distance"
                 style="@style/Card3TextSmall" />
 
             <TextView
                 android:id="@+id/textView32"
                 android:text="-.--"
-                style="@style/Card3TextMedium" />
+                style="@style/Card3TextMedium"
+                tools:ignore="HardcodedText" />
 
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/layout1"
             android:orientation="vertical"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -60,18 +60,18 @@
 
                 <TextView
                     android:id="@+id/textViewHeader31"
-                    android:text="time"
+                    android:text="@string/time"
                     style="@style/Card3TextSmall" />
 
                 <TextView
                     android:id="@+id/textView31"
                     android:text="--:--"
-                    style="@style/Card3TextLarge" />
+                    style="@style/Card3TextLarge"
+                    tools:ignore="HardcodedText" />
 
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/layout3"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
@@ -81,13 +81,14 @@
 
             <TextView
                 android:id="@+id/textViewHeader33"
-                android:text="lap pace"
+                android:text="@string/Lap_pace"
                 style="@style/Card3TextSmall" />
 
             <TextView
                 android:id="@+id/textView33"
                 android:text="-:--"
-                style="@style/Card3TextMedium" />
+                style="@style/Card3TextMedium"
+                tools:ignore="HardcodedText" />
 
         </LinearLayout>
 
diff --git a/wear/src/main/res/layout/connect_to_phone.xml b/wear/src/main/res/layout/connect_to_phone.xml
index cd052b227..2e69975a0 100644
--- a/wear/src/main/res/layout/connect_to_phone.xml
+++ b/wear/src/main/res/layout/connect_to_phone.xml
@@ -22,19 +22,15 @@
     android:layout_height="match_parent"
     android:padding="15dp">
 
-    <FrameLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:padding="5dp"
-        app:layout_box="all">
+        app:layout_box="all"
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center_horizontal"
-            android:orientation="vertical">
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
 
             <android.support.wearable.view.DelayedConfirmationView
                 android:id="@+id/icon_open_on_phone"
@@ -45,7 +41,7 @@
                 app:circle_radius="40dp"
                 app:circle_radius_pressed="50dp"
                 app:circle_border_width="5dp"
-                app:circle_border_color="@color/white"
+                app:circle_border_color="@android:color/white"
                 />
 
             <TextView
@@ -53,12 +49,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/Waiting_for_phone"
-                android:textColor="@color/white"
+                android:textColor="@android:color/white"
                 android:textSize="16sp"
                 android:textStyle="bold" />
 
         </LinearLayout>
 
-    </FrameLayout>
-
 </android.support.wearable.view.BoxInsetLayout>
diff --git a/wear/src/main/res/layout/newlap.xml b/wear/src/main/res/layout/newlap.xml
deleted file mode 100644
index 8b7798e2c..000000000
--- a/wear/src/main/res/layout/newlap.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 jonas.oreland@gmail.com
-  ~
-  ~  This program is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 3 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  This program is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<android.support.wearable.view.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="15dp">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:padding="5dp"
-        app:layout_box="all">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center_horizontal"
-            android:orientation="vertical">
-
-            <android.support.wearable.view.CircledImageView
-                android:id="@+id/icon_start"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_av_newlap"
-                app:circle_border_width="0dp"
-                app:circle_color="@color/action_button"
-                app:circle_radius="@dimen/one_button_radius" />
-
-            <TextView
-                android:id="@+id/txt_start"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/New_lap"
-                android:textColor="@color/white"
-                android:textSize="16sp"
-                android:textStyle="bold" />
-        </LinearLayout>
-    </FrameLayout>
-
-</android.support.wearable.view.BoxInsetLayout>
\ No newline at end of file
diff --git a/wear/src/main/res/layout/newlap_pause_resume.xml b/wear/src/main/res/layout/newlap_pause_resume.xml
index c344a80d9..3e5a731a1 100644
--- a/wear/src/main/res/layout/newlap_pause_resume.xml
+++ b/wear/src/main/res/layout/newlap_pause_resume.xml
@@ -32,7 +32,7 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="left|center"
+            android:layout_gravity="start|center"
             android:gravity="center_horizontal"
             android:orientation="vertical">
 
@@ -50,7 +50,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/New_lap"
-                android:textColor="@color/white"
+                android:textColor="@android:color/white"
                 android:textSize="16sp"
                 android:textStyle="bold" />
         </LinearLayout>
@@ -58,7 +58,7 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="right|center"
+            android:layout_gravity="end|center"
             android:gravity="center_horizontal"
             android:orientation="vertical">
 
@@ -76,7 +76,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/Resume"
-                android:textColor="@color/white"
+                android:textColor="@android:color/white"
                 android:textSize="16sp"
                 android:textStyle="bold" />
         </LinearLayout>
diff --git a/wear/src/main/res/layout/pause_resume.xml b/wear/src/main/res/layout/pause_resume.xml
deleted file mode 100644
index 22082055a..000000000
--- a/wear/src/main/res/layout/pause_resume.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 jonas.oreland@gmail.com
-  ~
-  ~  This program is free software: you can redistribute it and/or modify
-  ~  it under the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation, either version 3 of the License, or
-  ~  (at your option) any later version.
-  ~
-  ~  This program is distributed in the hope that it will be useful,
-  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  GNU General Public License for more details.
-  ~
-  ~  You should have received a copy of the GNU General Public License
-  ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<android.support.wearable.view.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="15dp">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:padding="5dp"
-        app:layout_box="all">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center_horizontal"
-            android:orientation="vertical">
-
-            <android.support.wearable.view.CircledImageView
-                android:id="@+id/icon_start"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_av_play_arrow"
-                app:circle_border_width="0dp"
-                app:circle_color="@color/action_button"
-                app:circle_radius="@dimen/one_button_radius" />
-
-            <TextView
-                android:id="@+id/txt_start"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/Resume"
-                android:textColor="@color/white"
-                android:textSize="16sp"
-                android:textStyle="bold" />
-        </LinearLayout>
-    </FrameLayout>
-
-</android.support.wearable.view.BoxInsetLayout>
\ No newline at end of file
diff --git a/wear/src/main/res/layout/searching.xml b/wear/src/main/res/layout/searching.xml
index 1af534257..4886cf080 100644
--- a/wear/src/main/res/layout/searching.xml
+++ b/wear/src/main/res/layout/searching.xml
@@ -22,17 +22,12 @@
     android:layout_height="match_parent"
     android:padding="15dp">
 
-    <FrameLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:padding="5dp"
-        app:layout_box="all">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
+        app:layout_box="all"
             android:gravity="center_horizontal"
             android:orientation="vertical">
 
@@ -50,10 +45,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/Searching_for_GPS"
-                android:textColor="@color/white"
+                android:textColor="@android:color/white"
                 android:textSize="16sp"
                 android:textStyle="bold" />
-        </LinearLayout>
-    </FrameLayout>
+
+    </LinearLayout>
 
 </android.support.wearable.view.BoxInsetLayout>
\ No newline at end of file
diff --git a/wear/src/main/res/layout/start.xml b/wear/src/main/res/layout/start.xml
index 03dddd9ff..b5e9bf4a9 100644
--- a/wear/src/main/res/layout/start.xml
+++ b/wear/src/main/res/layout/start.xml
@@ -22,17 +22,12 @@
     android:layout_height="match_parent"
     android:padding="15dp">
 
-    <FrameLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:padding="5dp"
-        app:layout_box="all">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
+        app:layout_box="all"
             android:gravity="center_horizontal"
             android:orientation="vertical">
 
@@ -50,10 +45,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/Start"
-                android:textColor="@color/white"
+                android:textColor="@android:color/white"
                 android:textSize="16sp"
                 android:textStyle="bold" />
-        </LinearLayout>
-    </FrameLayout>
+    </LinearLayout>
 
 </android.support.wearable.view.BoxInsetLayout>
\ No newline at end of file
diff --git a/wear/src/main/res/layout/stopped.xml b/wear/src/main/res/layout/stopped.xml
index ce49cb818..fa381d37b 100644
--- a/wear/src/main/res/layout/stopped.xml
+++ b/wear/src/main/res/layout/stopped.xml
@@ -22,17 +22,12 @@
     android:layout_height="match_parent"
     android:padding="15dp">
 
-    <FrameLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:padding="5dp"
-        app:layout_box="all">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
+        app:layout_box="all"
             android:gravity="center_horizontal"
             android:orientation="vertical">
 
@@ -50,10 +45,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/Saving_on_phone"
-                android:textColor="@color/white"
+                android:textColor="@android:color/white"
                 android:textSize="16sp"
                 android:textStyle="bold" />
-        </LinearLayout>
-    </FrameLayout>
+    </LinearLayout>
 
 </android.support.wearable.view.BoxInsetLayout>