Identify c:geo as an ordinary webbrowser. Fixes #1025

5 files changed, 6 insertions, 86 deletions

diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml
index 976a4ee..121c012 100644
--- a/main/res/layout/init.xml
+++ b/main/res/layout/init.xml
@@ -628,26 +628,6 @@
 						android:layout_width="fill_parent"
 						android:layout_height="wrap_content"
 						android:orientation="horizontal" >
-					<CheckBox android:id="@+id/browser"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_gravity="left"
-							android:padding="1px"
-							android:gravity="center" />
-					<TextView
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_gravity="center_vertical"
-							android:gravity="left"
-							android:paddingRight="3dip"
-							android:textSize="14dip"
-							android:textColor="?text_color"
-							android:text="@string/init_browser" />
-				</LinearLayout>
-				<LinearLayout
-						android:layout_width="fill_parent"
-						android:layout_height="wrap_content"
-						android:orientation="horizontal" >
 					<CheckBox android:id="@+id/trail"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
diff --git a/main/src/cgeo/geocaching/Constants.java b/main/src/cgeo/geocaching/Constants.java
index b996b20..2d4e0cc 100644
--- a/main/src/cgeo/geocaching/Constants.java
+++ b/main/src/cgeo/geocaching/Constants.java
@@ -14,6 +14,9 @@ public final class Constants {
     /** Number of logs to retrieve from GC.com */
     public final static int NUMBER_OF_LOGS = 35;
 
+    /** User agent id */
+    public final static String USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64; rv:9.0.1) Gecko/20100101 Firefox/9.0.1";
+
     /** Text separator used for formatting texts */
     public static final String SEPARATOR = " · ";
 
diff --git a/main/src/cgeo/geocaching/Settings.java b/main/src/cgeo/geocaching/Settings.java
index 9ed4f70..4f9a240 100644
--- a/main/src/cgeo/geocaching/Settings.java
+++ b/main/src/cgeo/geocaching/Settings.java
@@ -52,7 +52,6 @@ public final class Settings {
     private static final String KEY_ELEVATION_WANTED = "elevationwanted";
     private static final String KEY_FRIENDLOGS_WANTED = "friendlogswanted";
     private static final String KEY_USE_ENGLISH = "useenglish";
-    private static final String KEY_AS_BROWSER = "asbrowser";
     private static final String KEY_USE_COMPASS = "usecompass";
     private static final String KEY_AUTO_VISIT_TRACKABLES = "trackautovisit";
     private static final String KEY_AUTO_INSERT_SIGNATURE = "sigautoinsert";
@@ -436,10 +435,6 @@ public final class Settings {
         return sharedPrefs.getString(KEY_GC_CUSTOM_DATE, null);
     }
 
-    public static boolean isBrowser() {
-        return 0 != sharedPrefs.getInt(KEY_AS_BROWSER, 1);
-    }
-
     public static boolean isExcludeMyCaches() {
         return 0 != sharedPrefs.getInt(KEY_EXCLUDE_OWN, 0);
     }
@@ -466,16 +461,6 @@ public final class Settings {
         });
     }
 
-    public static void setAsBrowser(final boolean asBrowser) {
-        editSharedSettings(new PrefRunnable() {
-
-            @Override
-            public void edit(Editor edit) {
-                edit.putInt(KEY_AS_BROWSER, asBrowser ? 1 : 0);
-            }
-        });
-    }
-
     public static void setUseEnglish(final boolean english) {
         editSharedSettings(new PrefRunnable() {
             @Override
diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index a7131f5..e14d4c7 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -130,12 +130,6 @@ public class cgBase {
     private final static SimpleDateFormat dateTbIn2 = new SimpleDateFormat("EEEEE, MMMMM dd, yyyy", Locale.ENGLISH); // Saturday, March 28, 2009
     public static String version = null;
 
-    /**
-     * FIXME: browser id should become part of settings (where it can be created more easily depending on the current
-     * settings)
-     */
-    private static String idBrowser = "Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/533.4 (KHTML, like Gecko) Chrome/5.0.375.86 Safari/533.4";
-
     private static Context context;
     private static Resources res;
 
@@ -172,36 +166,6 @@ public class cgBase {
             Log.e(Settings.tag, "unable to get version information", e);
             version = null;
         }
-
-        if (Settings.isBrowser()) {
-            final long rndBrowser = Math.round(Math.random() * 6);
-            switch ((int) rndBrowser) {
-                case 0:
-                    idBrowser = "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/533.1 (KHTML, like Gecko) Chrome/5.0.322.2 Safari/533.1";
-                    break;
-                case 1:
-                    idBrowser = "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; WOW64; Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; MDDC)";
-                    break;
-                case 2:
-                    idBrowser = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3";
-                    break;
-                case 3:
-                    idBrowser = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_2; en-us) AppleWebKit/531.21.8 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10";
-                    break;
-                case 4:
-                    idBrowser = "Mozilla/5.0 (iPod; U; CPU iPhone OS 2_2_1 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.1.1 Mobile/5H11a Safari/525.20";
-                    break;
-                case 5:
-                    idBrowser = "Mozilla/5.0 (Linux; U; Android 1.1; en-gb; dream) AppleWebKit/525.10+ (KHTML, like Gecko) Version/3.0.4 Mobile Safari/523.12.2";
-                    break;
-                case 6:
-                    idBrowser = "Mozilla/5.0 (X11; U; Linux i686; en-US) AppleWebKit/533.4 (KHTML, like Gecko) Chrome/5.0.375.86 Safari/533.4";
-                    break;
-                default:
-                    idBrowser = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_2; en-US) AppleWebKit/532.9 (KHTML, like Gecko) Chrome/5.0.307.11 Safari/532.9";
-                    break;
-            }
-        }
     }
 
     public static String hidePassword(final String message) {
@@ -2576,11 +2540,9 @@ public class cgBase {
     }
 
     private static HttpResponse request(final HttpRequestBase request) {
-        if (Settings.isBrowser()) {
-            request.setHeader("Accept-Charset", "utf-8,iso-8859-1;q=0.8,utf-16;q=0.8,*;q=0.7");
-            request.setHeader("Accept-Language", "en-US,*;q=0.9");
-            request.getParams().setParameter(CoreProtocolPNames.USER_AGENT, idBrowser);
-        }
+        request.setHeader("Accept-Charset", "utf-8,iso-8859-1;q=0.8,utf-16;q=0.8,*;q=0.7");
+        request.setHeader("Accept-Language", "en-US,*;q=0.9");
+        request.getParams().setParameter(CoreProtocolPNames.USER_AGENT, Constants.USER_AGENT);
         return doRequest(request);
     }
 
diff --git a/main/src/cgeo/geocaching/cgeoinit.java b/main/src/cgeo/geocaching/cgeoinit.java
index be315ce..5a601ac 100644
--- a/main/src/cgeo/geocaching/cgeoinit.java
+++ b/main/src/cgeo/geocaching/cgeoinit.java
@@ -527,16 +527,6 @@ public class cgeoinit extends AbstractActivity {
             }
         });
 
-        final CheckBox browserButton = (CheckBox) findViewById(R.id.browser);
-        browserButton.setChecked(Settings.isBrowser());
-        browserButton.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                Settings.setAsBrowser(browserButton.isChecked());
-            }
-        });
-
         // Altitude settings
         EditText altitudeEdit = (EditText) findViewById(R.id.altitude);
         altitudeEdit.setText(String.valueOf(Settings.getAltCorrection()));