findbugs: avoid catching raw exception type

4 files changed, 33 insertions, 32 deletions

diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index 0fd6759..c7c28f3 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -542,7 +542,7 @@ public class MainActivity extends AbstractActivity {
                     navAccuracy.setText(null);
                     navLocation.setText(res.getString(R.string.loc_trying));
                 }
-            } catch (Exception e) {
+            } catch (RuntimeException e) {
                 Log.w("Failed to update location.");
             }
         }
diff --git a/main/src/cgeo/geocaching/filter/DistanceFilter.java b/main/src/cgeo/geocaching/filter/DistanceFilter.java
index 40d14b1..4d00b65 100644
--- a/main/src/cgeo/geocaching/filter/DistanceFilter.java
+++ b/main/src/cgeo/geocaching/filter/DistanceFilter.java
@@ -27,7 +27,7 @@ class DistanceFilter extends AbstractFilter {
         final Geopoint coords = cache.getCoords();
         if (coords == null) {
             // If a cache has no coordinates, consider it to be out of range. It will
-            // happen with archived cache.
+            // happen with archived caches.
             return false;
         }
         final float distance = currentPos.distanceTo(coords);
diff --git a/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java b/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java
index 14e0b33..221147c 100644
--- a/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java
+++ b/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java
@@ -5,6 +5,7 @@ import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.utils.Log;
 import cgeo.geocaching.utils.MatcherWrapper;
 
+import ch.boye.httpclientandroidlib.ParseException;
 import ch.boye.httpclientandroidlib.client.entity.UrlEncodedFormEntity;
 import ch.boye.httpclientandroidlib.util.EntityUtils;
 
@@ -22,6 +23,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import java.io.IOException;
 import java.util.regex.Pattern;
 
 public abstract class OAuthAuthorizationActivity extends AbstractActivity {
@@ -156,38 +158,36 @@ public abstract class OAuthAuthorizationActivity extends AbstractActivity {
     private void requestToken() {
 
         int status = 0;
-        try {
-            final Parameters params = new Parameters();
-            params.put("oauth_callback", "oob");
-            final String method = "GET";
-            OAuth.signOAuth(host, pathRequest, method, https, params, null, null, consumerKey, consumerSecret);
-            final String line = Network.getResponseData(Network.getRequest(getUrlPrefix() + host + pathRequest, params));
-
-            if (StringUtils.isNotBlank(line)) {
-                final MatcherWrapper paramsMatcher1 = new MatcherWrapper(paramsPattern1, line);
-                if (paramsMatcher1.find()) {
-                    OAtoken = paramsMatcher1.group(1);
-                }
-                final MatcherWrapper paramsMatcher2 = new MatcherWrapper(paramsPattern2, line);
-                if (paramsMatcher2.find()) {
-                    OAtokenSecret = paramsMatcher2.group(1);
-                }
+        final Parameters params = new Parameters();
+        params.put("oauth_callback", "oob");
+        final String method = "GET";
+        OAuth.signOAuth(host, pathRequest, method, https, params, null, null, consumerKey, consumerSecret);
+        final String line = Network.getResponseData(Network.getRequest(getUrlPrefix() + host + pathRequest, params));
+
+        if (StringUtils.isNotBlank(line)) {
+            final MatcherWrapper paramsMatcher1 = new MatcherWrapper(paramsPattern1, line);
+            if (paramsMatcher1.find()) {
+                OAtoken = paramsMatcher1.group(1);
+            }
+            final MatcherWrapper paramsMatcher2 = new MatcherWrapper(paramsPattern2, line);
+            if (paramsMatcher2.find()) {
+                OAtokenSecret = paramsMatcher2.group(1);
+            }
 
-                if (StringUtils.isNotBlank(OAtoken) && StringUtils.isNotBlank(OAtokenSecret)) {
-                    setTempTokens(OAtoken, OAtokenSecret);
-                    try {
-                        final Parameters paramsBrowser = new Parameters();
-                        paramsBrowser.put("oauth_token", OAtoken);
-                        final String encodedParams = EntityUtils.toString(new UrlEncodedFormEntity(paramsBrowser));
-                        startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getUrlPrefix() + host + pathAuthorize + "?" + encodedParams)));
-                        status = 1;
-                    } catch (Exception e) {
-                        Log.e("OAuthAuthorizationActivity.requestToken(2)", e);
-                    }
+            if (StringUtils.isNotBlank(OAtoken) && StringUtils.isNotBlank(OAtokenSecret)) {
+                setTempTokens(OAtoken, OAtokenSecret);
+                try {
+                    final Parameters paramsBrowser = new Parameters();
+                    paramsBrowser.put("oauth_token", OAtoken);
+                    final String encodedParams = EntityUtils.toString(new UrlEncodedFormEntity(paramsBrowser));
+                    startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getUrlPrefix() + host + pathAuthorize + "?" + encodedParams)));
+                    status = 1;
+                } catch (ParseException e) {
+                    Log.e("OAuthAuthorizationActivity.requestToken", e);
+                } catch (IOException e) {
+                    Log.e("OAuthAuthorizationActivity.requestToken", e);
                 }
             }
-        } catch (Exception e) {
-            Log.e("OAuthAuthorizationActivity.requestToken(1)", e);
         }
 
         requestTokenHandler.sendEmptyMessage(status);
diff --git a/main/src/cgeo/geocaching/utils/ImageUtils.java b/main/src/cgeo/geocaching/utils/ImageUtils.java
index ea7d3ff..dc6333a 100644
--- a/main/src/cgeo/geocaching/utils/ImageUtils.java
+++ b/main/src/cgeo/geocaching/utils/ImageUtils.java
@@ -10,6 +10,7 @@ import android.graphics.drawable.BitmapDrawable;
 
 import java.io.BufferedOutputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 
 public final class ImageUtils {
 
@@ -75,7 +76,7 @@ public final class ImageUtils {
             bitmap.compress(format, quality, bos);
             bos.flush();
             bos.close();
-        } catch (Exception e) {
+        } catch (IOException e) {
             Log.e("ImageHelper.storeBitmap", e);
         }
     }