refactoring: clean some warnings

6 files changed, 28 insertions, 37 deletions

diff --git a/main/src/cgeo/geocaching/AboutActivity.java b/main/src/cgeo/geocaching/AboutActivity.java
index b47091b..a76694b 100644
--- a/main/src/cgeo/geocaching/AboutActivity.java
+++ b/main/src/cgeo/geocaching/AboutActivity.java
@@ -8,6 +8,7 @@ import cgeo.geocaching.ui.AbstractCachingPageViewCreator;
 import cgeo.geocaching.ui.AnchorAwareLinkMovementMethod;
 import cgeo.geocaching.utils.Version;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.CharEncoding;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -20,7 +21,6 @@ import android.view.View;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;
@@ -196,12 +196,10 @@ public class AboutActivity extends AbstractViewPagerActivity<AboutActivity.Page>
 
     private String getRawResourceString(final int resourceId) {
         final InputStream ins = res.openRawResource(resourceId);
-        final String result = new Scanner(ins, CharEncoding.UTF_8).useDelimiter("\\A").next();
-        try {
-            ins.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        final Scanner scanner = new Scanner(ins, CharEncoding.UTF_8);
+        final String result = scanner.useDelimiter("\\A").next();
+        IOUtils.closeQuietly(ins);
+        IOUtils.closeQuietly(scanner);
         return result;
     }
 
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 4b0fc93..4068e38 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1026,17 +1026,15 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
 
             // data license
             final IConnector connector = ConnectorFactory.getConnector(cache);
-            if (connector != null) {
-                final String license = connector.getLicenseText(cache);
-                if (StringUtils.isNotBlank(license)) {
-                    view.findViewById(R.id.license_box).setVisibility(View.VISIBLE);
-                    final TextView licenseView = ((TextView) view.findViewById(R.id.license));
-                    licenseView.setText(Html.fromHtml(license), BufferType.SPANNABLE);
-                    licenseView.setClickable(true);
-                    licenseView.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
-                } else {
-                    view.findViewById(R.id.license_box).setVisibility(View.GONE);
-                }
+            final String license = connector.getLicenseText(cache);
+            if (StringUtils.isNotBlank(license)) {
+                view.findViewById(R.id.license_box).setVisibility(View.VISIBLE);
+                final TextView licenseView = ((TextView) view.findViewById(R.id.license));
+                licenseView.setText(Html.fromHtml(license), BufferType.SPANNABLE);
+                licenseView.setClickable(true);
+                licenseView.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
+            } else {
+                view.findViewById(R.id.license_box).setVisibility(View.GONE);
             }
 
             return view;
diff --git a/main/src/cgeo/geocaching/connector/AbstractConnector.java b/main/src/cgeo/geocaching/connector/AbstractConnector.java
index ac9246e..7913882 100644
--- a/main/src/cgeo/geocaching/connector/AbstractConnector.java
+++ b/main/src/cgeo/geocaching/connector/AbstractConnector.java
@@ -212,27 +212,27 @@ public abstract class AbstractConnector implements IConnector {
 
     @Override
     public final Collection<String> getCapabilities() {
-        ArrayList<String> builder = new ArrayList<String>();
-        addCapability(builder, ISearchByViewPort.class, R.string.feature_search_live_map);
-        addCapability(builder, ISearchByKeyword.class, R.string.feature_search_keyword);
-        addCapability(builder, ISearchByCenter.class, R.string.feature_search_center);
-        addCapability(builder, ISearchByGeocode.class, R.string.feature_search_geocode);
+        ArrayList<String> list = new ArrayList<String>();
+        addCapability(list, ISearchByViewPort.class, R.string.feature_search_live_map);
+        addCapability(list, ISearchByKeyword.class, R.string.feature_search_keyword);
+        addCapability(list, ISearchByCenter.class, R.string.feature_search_center);
+        addCapability(list, ISearchByGeocode.class, R.string.feature_search_geocode);
         if (supportsLogging()) {
-            builder.add(feature(R.string.feature_online_logging));
+            list.add(feature(R.string.feature_online_logging));
         }
         if (supportsLogImages()) {
-            builder.add(feature(R.string.feature_log_images));
+            list.add(feature(R.string.feature_log_images));
         }
         if (supportsPersonalNote()) {
-            builder.add(feature(R.string.feature_personal_notes));
+            list.add(feature(R.string.feature_personal_notes));
         }
         if (supportsOwnCoordinates()) {
-            builder.add(feature(R.string.feature_own_coordinates));
+            list.add(feature(R.string.feature_own_coordinates));
         }
         if (supportsWatchList()) {
-            builder.add(feature(R.string.feature_watch_list));
+            list.add(feature(R.string.feature_watch_list));
         }
-        return builder;
+        return list;
     }
 
     private void addCapability(final ArrayList<String> capabilities, final Class<? extends IConnector> clazz, final int featureResourceId) {
diff --git a/main/src/cgeo/geocaching/connector/gc/GCLogin.java b/main/src/cgeo/geocaching/connector/gc/GCLogin.java
index 8f3202e..a7cf6cf 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCLogin.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCLogin.java
@@ -100,7 +100,7 @@ public class GCLogin extends AbstractLogin {
             Log.i("Already logged in Geocaching.com as " + username + " (" + Settings.getMemberStatus() + ')');
             if (switchToEnglish(loginData) && retry) {
                 return login(false);
-            };
+            }
             return StatusCode.NO_ERROR; // logged in
         }
 
diff --git a/main/src/cgeo/geocaching/settings/CapabilitiesPreference.java b/main/src/cgeo/geocaching/settings/CapabilitiesPreference.java
index 98aabe8..7091f01 100644
--- a/main/src/cgeo/geocaching/settings/CapabilitiesPreference.java
+++ b/main/src/cgeo/geocaching/settings/CapabilitiesPreference.java
@@ -5,8 +5,6 @@ import cgeo.geocaching.R;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.connector.IConnector;
 
-import org.apache.commons.lang3.StringUtils;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -66,9 +64,6 @@ public class CapabilitiesPreference extends AbstractAttributeBasedPrefence {
     public String createCapabilitiesMessage() {
         // TODO: this needs a better key for the connectors
         IConnector connector = ConnectorFactory.getConnector(connectorCode + "1234");
-        if (connector == null) {
-            return StringUtils.EMPTY;
-        }
         StringBuilder builder = new StringBuilder("<p>"
                 + TextUtils.htmlEncode(CgeoApplication.getInstance().getString(R.string.feature_description)) + "</p><ul>");
 
diff --git a/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java b/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java
index fb72ee5..6590d22 100644
--- a/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java
+++ b/main/src/cgeo/geocaching/ui/logs/LogsViewCreator.java
@@ -84,7 +84,7 @@ public abstract class LogsViewCreator extends AbstractCachingListViewPageViewCre
 
         fillCountOrLocation(holder, log);
 
-        // logtext, avoid parsing HTML if not necessary
+        // log text, avoid parsing HTML if not necessary
         String logText = log.log;
         if (TextUtils.containsHtml(logText)) {
             logText = log.getDisplayText();
@@ -146,7 +146,7 @@ public abstract class LogsViewCreator extends AbstractCachingListViewPageViewCre
 
     abstract protected boolean isValid();
 
-    /** Loads the Log Images outside the ui thread. */
+    /** Loads the Log Images outside the UI thread. */
 
     private class LogImageLoader extends AsyncTask<String, Progress, Spanned> {
         final private LogViewHolder holder;