Merge branch 'master' of https://Bananeweizen@github.com/cgeo/c-geo-opensource.git

8 files changed, 38 insertions, 36 deletions

diff --git a/main/src/cgeo/geocaching/cgeo.java b/main/src/cgeo/geocaching/cgeo.java
index 6294fa1..404effa 100644
--- a/main/src/cgeo/geocaching/cgeo.java
+++ b/main/src/cgeo/geocaching/cgeo.java
@@ -279,7 +279,7 @@ public class cgeo extends AbstractActivity {
         final int id = item.getItemId();
         switch (id) {
             case MENU_ABOUT:
-                showAbout();
+                showAbout(null);
                 return true;
             case MENU_HELPERS:
                 context.startActivity(new Intent(context, cgeohelpers.class));
@@ -470,7 +470,7 @@ public class cgeo extends AbstractActivity {
         findOnMap.setClickable(true);
         findOnMap.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
-                cgeoFindOnMap();
+                cgeoFindOnMap(v);
             }
         });
 
@@ -478,7 +478,7 @@ public class cgeo extends AbstractActivity {
         findByOffline.setClickable(true);
         findByOffline.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
-                cgeoFindByOffline();
+                cgeoFindByOffline(v);
             }
         });
         registerForContextMenu(findByOffline);
@@ -489,7 +489,7 @@ public class cgeo extends AbstractActivity {
         advanced.setClickable(true);
         advanced.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
-                cgeoSearch();
+                cgeoSearch(v);
             }
         });
 
@@ -497,7 +497,7 @@ public class cgeo extends AbstractActivity {
         any.setClickable(true);
         any.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
-                cgeoPoint();
+                cgeoPoint(v);
             }
         });
 
@@ -534,7 +534,7 @@ public class cgeo extends AbstractActivity {
                     findNearest.setClickable(true);
                     findNearest.setOnClickListener(new OnClickListener() {
                         public void onClick(View v) {
-                            cgeoFindNearest();
+                            cgeoFindNearest(v);
                         }
                     });
                     findNearest.setBackgroundResource(R.drawable.main_nearby);
@@ -604,12 +604,12 @@ public class cgeo extends AbstractActivity {
         }
     }
 
-    public void cgeoFindOnMap() {
+    public void cgeoFindOnMap(View v) {
         findViewById(R.id.map).setPressed(true);
         context.startActivity(new Intent(context, settings.getMapFactory().getMapClass()));
     }
 
-    public void cgeoFindNearest() {
+    public void cgeoFindNearest(View v) {
         if (geo == null) {
             return;
         }
@@ -623,24 +623,24 @@ public class cgeo extends AbstractActivity {
         context.startActivity(cachesIntent);
     }
 
-    public void cgeoFindByOffline() {
+    public void cgeoFindByOffline(View v) {
         findViewById(R.id.search_offline).setPressed(true);
         final Intent cachesIntent = new Intent(context, cgeocaches.class);
         cachesIntent.putExtra("type", "offline");
         context.startActivity(cachesIntent);
     }
 
-    public void cgeoSearch() {
+    public void cgeoSearch(View v) {
         findViewById(R.id.advanced_button).setPressed(true);
         context.startActivity(new Intent(context, cgeoadvsearch.class));
     }
 
-    public void cgeoPoint() {
+    public void cgeoPoint(View v) {
         findViewById(R.id.any_button).setPressed(true);
         context.startActivity(new Intent(context, cgeopoint.class));
     }
 
-    public void cgeoFilter() {
+    public void cgeoFilter(View v) {
         findViewById(R.id.filter_button).setPressed(true);
         findViewById(R.id.filter_button).performClick();
     }
@@ -755,11 +755,11 @@ public class cgeo extends AbstractActivity {
         }
     }
 
-    public void showAbout() {
+    public void showAbout(View view) {
         context.startActivity(new Intent(context, cgeoabout.class));
     }
 
-    public void goSearch() {
+    public void goSearch(View view) {
         onSearchRequested();
     }
 }
diff --git a/main/src/cgeo/geocaching/cgeoabout.java b/main/src/cgeo/geocaching/cgeoabout.java
index 18128a0..41d7230 100644
--- a/main/src/cgeo/geocaching/cgeoabout.java
+++ b/main/src/cgeo/geocaching/cgeoabout.java
@@ -9,6 +9,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.text.method.LinkMovementMethod;
 import android.util.Log;
+import android.view.View;
 import android.widget.TextView;
 
 public class cgeoabout extends AbstractActivity {
@@ -51,35 +52,35 @@ public class cgeoabout extends AbstractActivity {
         }
     }
 
-    public void donateMore() {
+    public void donateMore(View view) {
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FMLNN8GXZKJEE")));
     }
 
-    public void donateLess() {
+    public void donateLess(View view) {
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FMLNN8GXZKJEE")));
     }
 
-    public void author() {
+    public void author(View view) {
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://carnero.cc/")));
     }
 
-    public void support() {
+    public void support(View view) {
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("mailto:support@cgeo.org")));
     }
 
-    public void website() {
+    public void website(View view) {
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.cgeo.org/")));
     }
 
-    public void facebook() {
+    public void facebook(View view) {
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.facebook.com/pages/cgeo/297269860090")));
     }
 
-    public void twitter() {
+    public void twitter(View view) {
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://twitter.com/android_gc")));
     }
 
-    public void nutshellmanual() {
+    public void nutshellmanual(View view) {
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.cgeo.org/")));
     }
 }
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index 11313c0..52d08ce 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -996,7 +996,7 @@ public class cgeocaches extends AbstractListActivity {
                 setComparator(item, new GeocodeComparator());
                 return false;
             case MENU_SWITCH_LIST:
-                selectList();
+                selectList(null);
                 return false;
             case MENU_SORT_RATING:
                 setComparator(item, new RatingComparator());
@@ -2362,7 +2362,7 @@ public class cgeocaches extends AbstractListActivity {
         }
     }
 
-    public void selectList() {
+    public void selectList(View view) {
         if (type.equals("offline") == false) {
             return;
         }
@@ -2522,7 +2522,7 @@ public class cgeocaches extends AbstractListActivity {
         alert.show();
     }
 
-    public void goMap() {
+    public void goMap(View view) {
         if (searchId == null || CollectionUtils.isEmpty(cacheList)) {
             showToast(res.getString(R.string.warn_no_cache_coord));
 
@@ -2536,7 +2536,7 @@ public class cgeocaches extends AbstractListActivity {
         startActivity(mapIntent);
     }
 
-    public void goManual() {
+    public void goManual(View view) {
         if (type != null && type.equals("offline")) {
             ActivityMixin.goManual(this, "c:geo-stored");
         } else if (type != null && type.equals("history")) {
diff --git a/main/src/cgeo/geocaching/cgeodetail.java b/main/src/cgeo/geocaching/cgeodetail.java
index 0e327f1..fe97146 100644
--- a/main/src/cgeo/geocaching/cgeodetail.java
+++ b/main/src/cgeo/geocaching/cgeodetail.java
@@ -1912,7 +1912,7 @@ public class cgeodetail extends AbstractActivity {
         }
     }
 
-    public void goCompass() {
+    public void goCompass(View view) {
         if (cache == null || cache.coords == null) {
             showToast(res.getString(R.string.cache_coordinates_no));
 
diff --git a/main/src/cgeo/geocaching/cgeohelpers.java b/main/src/cgeo/geocaching/cgeohelpers.java
index 4b7a211..cc288b1 100644
--- a/main/src/cgeo/geocaching/cgeohelpers.java
+++ b/main/src/cgeo/geocaching/cgeohelpers.java
@@ -5,6 +5,7 @@ import cgeo.geocaching.activity.AbstractActivity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.View;
 
 import java.util.Locale;
 
@@ -37,7 +38,7 @@ public class cgeohelpers extends AbstractActivity {
         finish();
     }
 
-    public void installManual() {
+    public void installManual(View view) {
         final Locale loc = Locale.getDefault();
         final String language = loc.getLanguage();
 
@@ -49,15 +50,15 @@ public class cgeohelpers extends AbstractActivity {
         }
     }
 
-    public void installLocus() {
+    public void installLocus(View view) {
         installFromMarket("menion.android.locus");
     }
 
-    public void installGpsStatus() {
+    public void installGpsStatus(View view) {
         installFromMarket("com.eclipsim.gpsstatus2");
     }
 
-    public void installBluetoothGps() {
+    public void installBluetoothGps(View view) {
         installFromMarket("googoo.android.btgps");
     }
 }
diff --git a/main/src/cgeo/geocaching/cgeoinit.java b/main/src/cgeo/geocaching/cgeoinit.java
index 781917d..d237f70 100644
--- a/main/src/cgeo/geocaching/cgeoinit.java
+++ b/main/src/cgeo/geocaching/cgeoinit.java
@@ -487,7 +487,7 @@ public class cgeoinit extends AbstractActivity {
         }
     }
 
-    public void backup() {
+    public void backup(View view) {
         // avoid overwriting an existing backup with an empty database (can happen directly after reinstalling the app)
         if (app.getAllStoredCachesCount(true, null, null) == 0) {
             return;
@@ -514,7 +514,7 @@ public class cgeoinit extends AbstractActivity {
         }
     }
 
-    public void restore() {
+    public void restore(View view) {
         final boolean status = app.restoreDatabase();
 
         if (status) {
diff --git a/main/src/cgeo/geocaching/cgeopopup.java b/main/src/cgeo/geocaching/cgeopopup.java
index 07c8412..8e04940 100644
--- a/main/src/cgeo/geocaching/cgeopopup.java
+++ b/main/src/cgeo/geocaching/cgeopopup.java
@@ -643,7 +643,7 @@ public class cgeopopup extends AbstractActivity {
         detailsList.addView(itemLayout);
     }
 
-    public void goCompass() {
+    public void goCompass(View view) {
         if (cache == null || cache.coords == null) {
             showToast(res.getString(R.string.cache_coordinates_no));
 
diff --git a/main/src/cgeo/geocaching/cgeowaypoint.java b/main/src/cgeo/geocaching/cgeowaypoint.java
index 25049c9..5951e47 100644
--- a/main/src/cgeo/geocaching/cgeowaypoint.java
+++ b/main/src/cgeo/geocaching/cgeowaypoint.java
@@ -243,7 +243,7 @@ public class cgeowaypoint extends AbstractActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         final int menuItem = item.getItemId();
         if (menuItem == MENU_ID_COMPASS) {
-            goCompass();
+            goCompass(null);
             return true;
         } else if (menuItem == MENU_ID_CACHES_AROUND) {
             cachesAround();
@@ -308,7 +308,7 @@ public class cgeowaypoint extends AbstractActivity {
         }
     }
 
-    public void goCompass() {
+    public void goCompass(View view) {
         if (!navigationPossible()) {
             return;
         }