multiple lint and compiler warning fixes

4 files changed, 308 insertions, 322 deletions

diff --git a/main/res/layout-land/coordinatesinput_dialog.xml b/main/res/layout-land/coordinatesinput_dialog.xml
index 56e7923..202f1d3 100644
--- a/main/res/layout-land/coordinatesinput_dialog.xml
+++ b/main/res/layout-land/coordinatesinput_dialog.xml
@@ -1,176 +1,169 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/linearLayout1"
+    android:id="@+id/scroller"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
+    android:layout_height="fill_parent"
+    android:fillViewport="true" >
 
-    <ScrollView
-        android:id="@+id/scroller"
+    <LinearLayout
+        android:id="@+id/scroller_child"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:fillViewport="true" >
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
 
-        <LinearLayout
-            android:id="@+id/scroller_child"
+        <Spinner
+            android:id="@+id/spinnerCoordinateFormats"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <Spinner
-                android:id="@+id/spinnerCoordinateFormats"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" />
-
-            <TableLayout
-                android:id="@+id/coordTable"
-                android:layout_width="fill_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:stretchColumns="0,1,3,5,7" >
-
-                <TableRow android:id="@+id/tableRow1" >
-
-                    <Button
-                        android:id="@+id/ButtonLat"
-                        style="@style/button_full" />
-
-                    <EditText
-                        android:id="@+id/EditTextLatDeg"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LatSeparator1"
-                        android:text="°"
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLatMin"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LatSeparator2"
-                        android:text=","
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLatSec"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LatSeparator3"
-                        android:text=","
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLatSecFrac"
-                        style="@style/edittext_full"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-                </TableRow>
-
-                <TableRow android:id="@+id/tableRow2" >
-
-                    <Button
-                        android:id="@+id/ButtonLon"
-                        style="@style/button_full" />
-
-                    <EditText
-                        android:id="@+id/EditTextLonDeg"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LonSeparator1"
-                        android:text="°"
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLonMin"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LonSeparator2"
-                        android:text=","
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLonSec"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LonSeparator3"
-                        android:text=","
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLonSecFrac"
-                        style="@style/edittext_full"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-                </TableRow>
-            </TableLayout>
-
-            <EditText
-                android:id="@+id/latitude"
-                style="@style/edittext_full"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/latitude" />
+            android:layout_height="wrap_content" />
 
-            <EditText
-                android:id="@+id/longitude"
-                style="@style/edittext_full"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/longitude" />
+        <TableLayout
+            android:id="@+id/coordTable"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:stretchColumns="0,1,3,5,7" >
 
-            <LinearLayout
-                android:id="@+id/linearLayout2"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" >
+            <TableRow android:id="@+id/tableRow1" >
 
                 <Button
-                    android:id="@+id/current"
-                    style="@style/button_full"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/waypoint_my_coordinates" />
+                    android:id="@+id/ButtonLat"
+                    style="@style/button_full" />
+
+                <EditText
+                    android:id="@+id/EditTextLatDeg"
+                    style="@style/edittext_full"
+                    android:gravity="right"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true" />
+
+                <TextView
+                    android:id="@+id/LatSeparator1"
+                    android:text="°"
+                    tools:ignore="HardcodedText" />
+
+                <EditText
+                    android:id="@+id/EditTextLatMin"
+                    style="@style/edittext_full"
+                    android:gravity="right"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true" />
+
+                <TextView
+                    android:id="@+id/LatSeparator2"
+                    android:text=","
+                    tools:ignore="HardcodedText" />
+
+                <EditText
+                    android:id="@+id/EditTextLatSec"
+                    style="@style/edittext_full"
+                    android:gravity="right"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true" />
+
+                <TextView
+                    android:id="@+id/LatSeparator3"
+                    android:text=","
+                    tools:ignore="HardcodedText" />
+
+                <EditText
+                    android:id="@+id/EditTextLatSecFrac"
+                    style="@style/edittext_full"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true" />
+            </TableRow>
+
+            <TableRow android:id="@+id/tableRow2" >
 
                 <Button
-                    android:id="@+id/cache"
-                    style="@style/button_full"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/waypoint_cache_coordinates" />
-            </LinearLayout>
+                    android:id="@+id/ButtonLon"
+                    style="@style/button_full" />
+
+                <EditText
+                    android:id="@+id/EditTextLonDeg"
+                    style="@style/edittext_full"
+                    android:gravity="right"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true" />
+
+                <TextView
+                    android:id="@+id/LonSeparator1"
+                    android:text="°"
+                    tools:ignore="HardcodedText" />
+
+                <EditText
+                    android:id="@+id/EditTextLonMin"
+                    style="@style/edittext_full"
+                    android:gravity="right"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true" />
+
+                <TextView
+                    android:id="@+id/LonSeparator2"
+                    android:text=","
+                    tools:ignore="HardcodedText" />
+
+                <EditText
+                    android:id="@+id/EditTextLonSec"
+                    style="@style/edittext_full"
+                    android:gravity="right"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true" />
+
+                <TextView
+                    android:id="@+id/LonSeparator3"
+                    android:text=","
+                    tools:ignore="HardcodedText" />
+
+                <EditText
+                    android:id="@+id/EditTextLonSecFrac"
+                    style="@style/edittext_full"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true" />
+            </TableRow>
+        </TableLayout>
+
+        <EditText
+            android:id="@+id/latitude"
+            style="@style/edittext_full"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/latitude" />
+
+        <EditText
+            android:id="@+id/longitude"
+            style="@style/edittext_full"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/longitude" />
+
+        <LinearLayout
+            android:id="@+id/linearLayout2"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" >
 
             <Button
-                android:id="@+id/done"
+                android:id="@+id/current"
                 style="@style/button_full"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/waypoint_done" />
+                android:layout_weight="1"
+                android:text="@string/waypoint_my_coordinates" />
+
+            <Button
+                android:id="@+id/cache"
+                style="@style/button_full"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/waypoint_cache_coordinates" />
         </LinearLayout>
-    </ScrollView>
 
-</LinearLayout>
\ No newline at end of file
+        <Button
+            android:id="@+id/done"
+            style="@style/button_full"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/waypoint_done" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/coordinatesinput_dialog.xml b/main/res/layout/coordinatesinput_dialog.xml
index cc3e36f..9b5cb8d 100644
--- a/main/res/layout/coordinatesinput_dialog.xml
+++ b/main/res/layout/coordinatesinput_dialog.xml
@@ -1,168 +1,161 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/linearLayout1"
+    android:id="@+id/scroller"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
+    android:layout_height="fill_parent"
+    android:fillViewport="true" >
 
-    <ScrollView
-        android:id="@+id/scroller"
+    <LinearLayout
+        android:id="@+id/scroller_child"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:fillViewport="true" >
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
 
-        <LinearLayout
-            android:id="@+id/scroller_child"
+        <Spinner
+            android:id="@+id/spinnerCoordinateFormats"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" />
+
+        <TableLayout
+            android:id="@+id/coordTable"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:stretchColumns="0,1,3,5,7" >
+
+            <TableRow android:id="@+id/tableRow1" >
+
+                <Button
+                    android:id="@+id/ButtonLat"
+                    style="@style/button_full" />
+
+                <EditText
+                    android:id="@+id/EditTextLatDeg"
+                    style="@style/edittext_full"
+                    android:gravity="right"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true" />
+
+                <TextView
+                    android:id="@+id/LatSeparator1"
+                    android:text="°"
+                    tools:ignore="HardcodedText" />
+
+                <EditText
+                    android:id="@+id/EditTextLatMin"
+                    style="@style/edittext_full"
+                    android:gravity="right"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true" />
+
+                <TextView
+                    android:id="@+id/LatSeparator2"
+                    android:text=","
+                    tools:ignore="HardcodedText" />
+
+                <EditText
+                    android:id="@+id/EditTextLatSec"
+                    style="@style/edittext_full"
+                    android:gravity="right"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true" />
+
+                <TextView
+                    android:id="@+id/LatSeparator3"
+                    android:text=","
+                    tools:ignore="HardcodedText" />
+
+                <EditText
+                    android:id="@+id/EditTextLatSecFrac"
+                    style="@style/edittext_full"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true" />
+            </TableRow>
+
+            <TableRow android:id="@+id/tableRow2" >
+
+                <Button
+                    android:id="@+id/ButtonLon"
+                    style="@style/button_full" />
+
+                <EditText
+                    android:id="@+id/EditTextLonDeg"
+                    style="@style/edittext_full"
+                    android:gravity="right"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true" />
+
+                <TextView
+                    android:id="@+id/LonSeparator1"
+                    android:text="°"
+                    tools:ignore="HardcodedText" />
+
+                <EditText
+                    android:id="@+id/EditTextLonMin"
+                    style="@style/edittext_full"
+                    android:gravity="right"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true" />
+
+                <TextView
+                    android:id="@+id/LonSeparator2"
+                    android:text=","
+                    tools:ignore="HardcodedText" />
+
+                <EditText
+                    android:id="@+id/EditTextLonSec"
+                    style="@style/edittext_full"
+                    android:gravity="right"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true" />
+
+                <TextView
+                    android:id="@+id/LonSeparator3"
+                    android:text=","
+                    tools:ignore="HardcodedText" />
+
+                <EditText
+                    android:id="@+id/EditTextLonSecFrac"
+                    style="@style/edittext_full"
+                    android:inputType="number"
+                    android:selectAllOnFocus="true" />
+            </TableRow>
+        </TableLayout>
+
+        <EditText
+            android:id="@+id/latitude"
+            style="@style/edittext_full"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/latitude" />
+
+        <EditText
+            android:id="@+id/longitude"
+            style="@style/edittext_full"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/longitude" />
+
+        <Button
+            android:id="@+id/current"
+            style="@style/button_full"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/waypoint_my_coordinates" />
+
+        <Button
+            android:id="@+id/cache"
+            style="@style/button_full"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <Spinner
-                android:id="@+id/spinnerCoordinateFormats"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content" />
-
-            <TableLayout
-                android:id="@+id/coordTable"
-                android:layout_width="fill_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:stretchColumns="0,1,3,5,7" >
-
-                <TableRow android:id="@+id/tableRow1" >
-
-                    <Button
-                        android:id="@+id/ButtonLat"
-                        style="@style/button_full" />
-
-                    <EditText
-                        android:id="@+id/EditTextLatDeg"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LatSeparator1"
-                        android:text="°"
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLatMin"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LatSeparator2"
-                        android:text=","
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLatSec"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LatSeparator3"
-                        android:text=","
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLatSecFrac"
-                        style="@style/edittext_full"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-                </TableRow>
-
-                <TableRow android:id="@+id/tableRow2" >
-
-                    <Button
-                        android:id="@+id/ButtonLon"
-                        style="@style/button_full" />
-
-                    <EditText
-                        android:id="@+id/EditTextLonDeg"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LonSeparator1"
-                        android:text="°"
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLonMin"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LonSeparator2"
-                        android:text=","
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLonSec"
-                        style="@style/edittext_full"
-                        android:gravity="right"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-
-                    <TextView
-                        android:id="@+id/LonSeparator3"
-                        android:text=","
-                        tools:ignore="HardcodedText" />
-
-                    <EditText
-                        android:id="@+id/EditTextLonSecFrac"
-                        style="@style/edittext_full"
-                        android:inputType="number"
-                        android:selectAllOnFocus="true" />
-                </TableRow>
-            </TableLayout>
-
-            <EditText
-                android:id="@+id/latitude"
-                style="@style/edittext_full"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/latitude" />
-
-            <EditText
-                android:id="@+id/longitude"
-                style="@style/edittext_full"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/longitude" />
-
-            <Button
-                android:id="@+id/current"
-                style="@style/button_full"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/waypoint_my_coordinates" />
-
-            <Button
-                android:id="@+id/cache"
-                style="@style/button_full"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/waypoint_cache_coordinates" />
-
-            <Button
-                android:id="@+id/done"
-                style="@style/button_full"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/waypoint_done" />
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
+            android:text="@string/waypoint_cache_coordinates" />
+
+        <Button
+            android:id="@+id/done"
+            style="@style/button_full"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/waypoint_done" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/main/src/cgeo/geocaching/LogTrackableActivity.java b/main/src/cgeo/geocaching/LogTrackableActivity.java
index e1ca612..9f1bc88 100644
--- a/main/src/cgeo/geocaching/LogTrackableActivity.java
+++ b/main/src/cgeo/geocaching/LogTrackableActivity.java
@@ -20,7 +20,6 @@ import cgeo.geocaching.utils.LogTemplateProvider.LogContext;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
diff --git a/main/src/cgeo/geocaching/geopoint/Units.java b/main/src/cgeo/geocaching/geopoint/Units.java
index 4d11a3b..d00e075 100644
--- a/main/src/cgeo/geocaching/geopoint/Units.java
+++ b/main/src/cgeo/geocaching/geopoint/Units.java
@@ -4,6 +4,8 @@ import cgeo.geocaching.settings.Settings;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
+import java.util.Locale;
+
 public class Units {
 
     public static ImmutablePair<Double, String> scaleDistance(final double distanceKilometers) {
@@ -53,9 +55,8 @@ public class Units {
 
     public static String getSpeed(final float kilometersPerHour) {
         if (Settings.isUseImperialUnits()) {
-            return String.format("%.0f mph", kilometersPerHour / IConversion.MILES_TO_KILOMETER);
-        } else {
-            return String.format("%.0f km/h", kilometersPerHour);
+            return String.format(Locale.US, "%.0f mph", kilometersPerHour / IConversion.MILES_TO_KILOMETER);
         }
+        return String.format(Locale.US, "%.0f km/h", kilometersPerHour);
     }
 }