From 29be0f72a3f0668b663897e7a62b7e0ba4ede9f6 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sun, 11 Nov 2012 13:44:58 +0100
Subject: refactoring: Lint cleanups

---
 main/res/layout/about.xml                            |  1 -
 main/res/layout/simple_dir_chooser.xml               |  7 +++++--
 main/res/values-cs/strings.xml                       |  1 -
 main/res/values-es/strings.xml                       |  1 -
 main/res/values-fr/strings.xml                       |  1 -
 main/res/values-hu/strings.xml                       |  1 -
 main/res/values-it/strings.xml                       |  1 -
 main/res/values-ja/strings.xml                       |  1 -
 main/res/values-nl/strings.xml                       |  1 -
 main/res/values-pl/strings.xml                       |  1 -
 main/res/values-pt/strings.xml                       |  1 -
 main/res/values-sk/strings.xml                       |  1 -
 main/src/cgeo/geocaching/files/FileList.java         | 13 ++++++-------
 tests/src/cgeo/geocaching/SettingsTest.java          |  2 ++
 tests/src/cgeo/geocaching/activity/ProgressTest.java |  2 ++
 tests/src/cgeo/geocaching/cgeogpxesTest.java         |  2 ++
 16 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/main/res/layout/about.xml b/main/res/layout/about.xml
index fc29654..13d7c04 100644
--- a/main/res/layout/about.xml
+++ b/main/res/layout/about.xml
@@ -82,7 +82,6 @@
 					android:orientation="horizontal"
 					android:gravity="center_horizontal" >
 				<Button style="@style/button_full"
-						android:id="@+id/donation_more"
 						android:layout_width="280dip"
 						android:singleLine="false"
 						android:lines="2"
diff --git a/main/res/layout/simple_dir_chooser.xml b/main/res/layout/simple_dir_chooser.xml
index f8e58e6..1b6b659 100644
--- a/main/res/layout/simple_dir_chooser.xml
+++ b/main/res/layout/simple_dir_chooser.xml
@@ -20,8 +20,11 @@
 				android:id="@+id/simple_dir_chooser_path"
 				android:singleLine="true"
 				android:lines="0"
-				android:editable="false"
-				android:scrollHorizontally="true"
+				android:clickable="false" 
+		        android:cursorVisible="false" 
+		        android:focusable="false" 
+		        android:focusableInTouchMode="false"
+        		android:scrollHorizontally="true"
 				android:inputType="textNoSuggestions" />
 	</LinearLayout>
    	<ListView 
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index c10b4fb..bf43a6e 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -371,7 +371,6 @@
   <string name="init_mapsources">Zdroje map</string>
   <string name="init_mapsources_description">Zde můžete vybrat zdroj map. Alternativou ke Google maps jsou různé typy OpenStreetMap, jakož i offline mapové podklady (Více viz na <a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a>).</string>
   <string name="init_mapsource_select">Vyber zdroj mapy</string>
-  <string name="init_select_mapfile">…</string>
   <string name="init_maptrail">Zobrazuj trasu na mapě</string>
   <string name="init_trackautovisit">Nastav sledovatelné předměty na \"Návštěva\" jako výchozí.</string>
   <string name="init_sigautoinsert">Automaticky vkládej podpis</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index 354346d..265eb5d 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -373,7 +373,6 @@
   <string name="init_mapsources">Proveedor de mapas</string>
   <string name="init_mapsources_description">Aquí puedes seleccionar un proveedor de mapas. Como alternativa a Google Maps están disponibles varios estilos de OpenStreetMap e incluso mapas fuera de linea (mira <a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a> para más información).</string>
   <string name="init_mapsource_select">Elige proveedor de mapas</string>
-  <string name="init_select_mapfile">…</string>
   <string name="init_trackautovisit">Convertir rastreables automáticamente a \"visita\"</string>
   <string name="init_sigautoinsert">Insertar firma automáticamente</string>
 
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 001d30c..62d397d 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -423,7 +423,6 @@
   <string name="init_mapsources">Source des cartes</string>
   <string name="init_mapsources_description">Vous pouvez choisir la source de vos cartes. En tant qu\'alternative aux cartes Google, diverses cartes de type OpenStreetMap sont disponibles et même en hors-ligne (voir <a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a> pour plus de détails).</string>
   <string name="init_mapsource_select">Choisir la source des cartes</string>
-  <string name="init_select_mapfile">…</string>
   <string name="init_maptrail">Montrer la trace sur la carte</string>
   <string name="init_trackautovisit">Marquer automatiquement les objets voyageurs comme \"visité\"</string>
   <string name="init_sigautoinsert">Insérer la signature automatiquement</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index b3b3c58..6b417d6 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -378,7 +378,6 @@
   <string name="init_mapsources">Térkép források</string>
   <string name="init_mapsources_description">Itt választhatod ki a térképeid forrását. A Google térképek alternatívájaként több OpenStreetMap stílus is hozzáférhető és offline térkép fájlokat is használhatsz. (További információ <a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a>).</string>
   <string name="init_mapsource_select">Válassz térkép forrást</string>
-  <string name="init_select_mapfile">…</string>
   <string name="init_trackautovisit">A nyomonkövethető tárgyak automatikus \"látogatott\" logolása</string>
   <string name="init_sigautoinsert">Aláírás automatikus beillesztése</string>
   <string name="init_loaddirectionimg">Irány-kép betöltése ha szükséges</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index af34a30..56e24c7 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -422,7 +422,6 @@
   <string name="init_mapsources">Tipi di mappe</string>
   <string name="init_mapsources_description">Qui puoi scegliere dove c:geo preleverà le mappe. Come alternativa a Google maps esistono vari stili di OpenStreetMap disponibili anche per uso offline (vedi <a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a> per dettagli).</string>
   <string name="init_mapsource_select">Seleziona il tipo di mappa</string>
-  <string name="init_select_mapfile">…</string>
   <string name="init_select_gpx_exportdir">…</string>
   <string name="init_select_gpx_importdir">…</string>
   <string name="init_gpx_exportdir">Cartella di export GPX</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index 88bcca6..a8e5ef6 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -426,7 +426,6 @@
   <string name="init_mapsources">地図の設定</string>
   <string name="init_mapsources_description">オンライン地図をGoogleマップからOpenStreetMap(その派生オンライン地図やオフライン地図)に変更できます。詳細は<a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a> (英語)をご覧ください。</string>
   <string name="init_mapsource_select">地図の選択</string>
-  <string name="init_select_mapfile">選択…</string>
   <string name="init_select_gpx_exportdir">選択…</string>
   <string name="init_select_gpx_importdir">選択…</string>
   <string name="init_gpx_exportdir">GPXエクスポートフォルダ</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index df7a3fd..8013de3 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -412,7 +412,6 @@
   <string name="init_mapsources">Kaartbron</string>
   <string name="init_mapsources_description">Hier kan een kaartenbron geselecteerd worden. Als alternatief voor Google maps zijn verschillende OpenStreetMap varianten en ook offline kaarten-files beschikbaar (Zie <a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a> voor meer info).</string>
   <string name="init_mapsource_select">Selecteer kaartbron</string>
-  <string name="init_select_mapfile">…</string>
   <string name="init_maptrail">Laat pad op kaart zien</string>
   <string name="init_trackautovisit">Zet trackables automatisch op \'bezocht\'</string>
   <string name="init_sigautoinsert">Voeg handtekening automatisch toe</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index 05b18ac..ce8c875 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -368,7 +368,6 @@
   <string name="init_mapsources">Źródła mapy</string>
   <string name="init_mapsources_description">Tutaj można wybrać źródło mapy. Jako alternatywę do Google maps, są dostępne różne style OpenStreetMap, a nawet pliki offline z mapą (szczegóły znajdziesz tutaj: <a href="http://code.google.com/p/mapsforge/"> http://code.google.com/p/mapsforge/</a>).</string>
   <string name="init_mapsource_select">Wybierz źródło mapy</string>
-  <string name="init_select_mapfile">…</string>
   <string name="init_trackautovisit">Ustaw przedmioty podróżne automatycznie na \"wizytę\"</string>
   <string name="init_sigautoinsert">Wstaw podpis automatycznie</string>
   <string name="init_loaddirectionimg">Załaduj obrazek kierunku w razie potrzeby</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index 7333eb1..88f6634 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -406,7 +406,6 @@
   <string name="init_mapsources">Fontes de mapa</string>
   <string name="init_mapsources_description">Aqui pode seleccionar a fonte dos seus mapas. Como alternativa ao Google Maps, vários estilos de OpenStreetMap estão disponíveis, e até ficheiros de mapas offline (veja <a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a> para mais detalhes).</string>
   <string name="init_mapsource_select">Seleccione a fonte de mapa</string>
-  <string name="init_select_mapfile">…</string>
   <string name="init_maptrail">Mostrar rasto no mapa</string>
   <string name="init_trackautovisit">Marcar automaticamente os trackables como \"visitados\"</string>
   <string name="init_sigautoinsert">Inserir assinatura automaticamente</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index 30fbfc3..08b51bd 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -425,7 +425,6 @@
   <string name="init_mapsources">Mapové zdroje</string>
   <string name="init_mapsources_description">Tu môžete vybrať zdroje pre vaše mapy. Je to alternatíva ku Google mapám rôznych OpenStreetMap styles sú dostupné a dokonca offline mapové súbory (podrobnosti nájdete na <a href="http://code.google.com/p/mapsforge/">http://code.google.com/p/mapsforge/</a>).</string>
   <string name="init_mapsource_select">Vyberte zdroj máp</string>
-  <string name="init_select_mapfile">…</string>
   <string name="init_select_gpx_exportdir">…</string>
   <string name="init_gpx_exportdir">Adresár pre GPX Export</string>
   <string name="init_gpx_exportdir_description">Tu si môžete vybrať adresár pre GPX exporty.</string>
diff --git a/main/src/cgeo/geocaching/files/FileList.java b/main/src/cgeo/geocaching/files/FileList.java
index 1eaefbb..df95085 100644
--- a/main/src/cgeo/geocaching/files/FileList.java
+++ b/main/src/cgeo/geocaching/files/FileList.java
@@ -33,8 +33,9 @@ public abstract class FileList<T extends ArrayAdapter<File>> extends AbstractLis
     private T adapter = null;
     private ProgressDialog waitDialog = null;
     private SearchFilesThread searchingThread = null;
-    private boolean endSearching = false;
     private int listId = StoredList.STANDARD_LIST_ID;
+    private String[] extensions;
+
     final private Handler changeWaitDialogHandler = new Handler() {
         private String searchInfo;
 
@@ -79,7 +80,6 @@ public abstract class FileList<T extends ArrayAdapter<File>> extends AbstractLis
             }
         }
     };
-    private String[] extensions;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -118,7 +118,6 @@ public abstract class FileList<T extends ArrayAdapter<File>> extends AbstractLis
                 }
                 );
 
-        endSearching = false;
         searchingThread = new SearchFilesThread();
         searchingThread.start();
     }
@@ -199,11 +198,11 @@ public abstract class FileList<T extends ArrayAdapter<File>> extends AbstractLis
 
             loadFilesHandler.sendMessage(Message.obtain(loadFilesHandler));
         }
-    }
 
-    private void listDirs(List<File> list, List<File> directories, FileListSelector selector, Handler feedbackHandler) {
-        for (final File dir : directories) {
-            FileUtils.listDir(list, dir, selector, feedbackHandler);
+        private void listDirs(List<File> list, List<File> directories, FileListSelector selector, Handler feedbackHandler) {
+            for (final File dir : directories) {
+                FileUtils.listDir(list, dir, selector, feedbackHandler);
+            }
         }
     }
 
diff --git a/tests/src/cgeo/geocaching/SettingsTest.java b/tests/src/cgeo/geocaching/SettingsTest.java
index 06b849d..04fe2cb 100644
--- a/tests/src/cgeo/geocaching/SettingsTest.java
+++ b/tests/src/cgeo/geocaching/SettingsTest.java
@@ -3,8 +3,10 @@ package cgeo.geocaching;
 import cgeo.geocaching.connector.gc.GCConstants;
 import cgeo.geocaching.maps.mapsforge.MapsforgeMapProvider;
 
+import android.annotation.TargetApi;
 import android.test.ActivityInstrumentationTestCase2;
 
+@TargetApi(8)
 public class SettingsTest extends ActivityInstrumentationTestCase2<cgeo> {
 
     public SettingsTest() {
diff --git a/tests/src/cgeo/geocaching/activity/ProgressTest.java b/tests/src/cgeo/geocaching/activity/ProgressTest.java
index aa2460c..e72c90a 100644
--- a/tests/src/cgeo/geocaching/activity/ProgressTest.java
+++ b/tests/src/cgeo/geocaching/activity/ProgressTest.java
@@ -2,8 +2,10 @@ package cgeo.geocaching.activity;
 
 import cgeo.geocaching.cgeo;
 
+import android.annotation.TargetApi;
 import android.test.ActivityInstrumentationTestCase2;
 
+@TargetApi(8)
 public class ProgressTest extends ActivityInstrumentationTestCase2<cgeo> {
     public ProgressTest() {
         super(cgeo.class);
diff --git a/tests/src/cgeo/geocaching/cgeogpxesTest.java b/tests/src/cgeo/geocaching/cgeogpxesTest.java
index 9de36ff..8f9de4a 100644
--- a/tests/src/cgeo/geocaching/cgeogpxesTest.java
+++ b/tests/src/cgeo/geocaching/cgeogpxesTest.java
@@ -1,7 +1,9 @@
 package cgeo.geocaching;
 
+import android.annotation.TargetApi;
 import android.test.ActivityInstrumentationTestCase2;
 
+@TargetApi(8)
 public class cgeogpxesTest extends ActivityInstrumentationTestCase2<cgeogpxes> {
     private final cgeogpxes importGpxActivity = new cgeogpxes();
 
-- 
cgit v1.1