diff options
12 files changed, 40 insertions, 17 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConstants.java b/main/src/cgeo/geocaching/connector/gc/GCConstants.java index a598bad..e6608d7 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCConstants.java +++ b/main/src/cgeo/geocaching/connector/gc/GCConstants.java @@ -1,5 +1,7 @@ package cgeo.geocaching.connector.gc; +import org.eclipse.jdt.annotation.NonNull; + import java.util.Locale; import java.util.regex.Pattern; @@ -15,13 +17,13 @@ public final class GCConstants { static final String GC_URL = "http://www.geocaching.com/"; static final String GC_TILE_URL = "http://tiles.geocaching.com/"; /** Live Map */ - public final static String URL_LIVE_MAP = GC_URL + "map/default.aspx"; + public final static @NonNull String URL_LIVE_MAP = GC_URL + "map/default.aspx"; /** Live Map pop-up */ - public final static String URL_LIVE_MAP_DETAILS = GC_TILE_URL + "map.details"; + public final static @NonNull String URL_LIVE_MAP_DETAILS = GC_TILE_URL + "map.details"; /** Caches in a tile */ - public final static String URL_MAP_INFO = GC_TILE_URL + "map.info"; + public final static @NonNull String URL_MAP_INFO = GC_TILE_URL + "map.info"; /** Tile itself */ - public final static String URL_MAP_TILE = GC_TILE_URL + "map.png"; + public final static @NonNull String URL_MAP_TILE = GC_TILE_URL + "map.png"; /** * Patterns for parsing the result of a (detailed) search diff --git a/main/src/cgeo/geocaching/connector/gc/Tile.java b/main/src/cgeo/geocaching/connector/gc/Tile.java index 623730a..6a257cd 100644 --- a/main/src/cgeo/geocaching/connector/gc/Tile.java +++ b/main/src/cgeo/geocaching/connector/gc/Tile.java @@ -10,6 +10,8 @@ import cgeo.geocaching.utils.Log; import ch.boye.httpclientandroidlib.HttpResponse; +import org.eclipse.jdt.annotation.NonNull; + import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -110,6 +112,7 @@ public class Tile { * @see <a * href="http://developers.cloudmade.com/projects/tiles/examples/convert-coordinates-to-tile-numbers">Cloudmade</a> */ + @NonNull public Geopoint getCoord(UTFGridPosition pos) { double pixX = tileX * TILE_SIZE + pos.x * 4; @@ -244,7 +247,7 @@ public class Tile { return null; } - public boolean containsPoint(final ICoordinates point) { + public boolean containsPoint(final @NonNull ICoordinates point) { return viewPort.contains(point); } diff --git a/main/src/cgeo/geocaching/connector/oc/IOCAuthParams.java b/main/src/cgeo/geocaching/connector/oc/IOCAuthParams.java index dacb626..acf7b48 100644 --- a/main/src/cgeo/geocaching/connector/oc/IOCAuthParams.java +++ b/main/src/cgeo/geocaching/connector/oc/IOCAuthParams.java @@ -1,5 +1,7 @@ package cgeo.geocaching.connector.oc; +import org.eclipse.jdt.annotation.NonNull; + public interface IOCAuthParams { /** @@ -7,6 +9,7 @@ public interface IOCAuthParams { * * @return */ + @NonNull String getSite(); /** @@ -63,5 +66,6 @@ public interface IOCAuthParams { * * @return */ + @NonNull String getCallbackUri(); } diff --git a/main/src/cgeo/geocaching/maps/google/GoogleMapView.java b/main/src/cgeo/geocaching/maps/google/GoogleMapView.java index 471e061..610dbe1 100644 --- a/main/src/cgeo/geocaching/maps/google/GoogleMapView.java +++ b/main/src/cgeo/geocaching/maps/google/GoogleMapView.java @@ -18,6 +18,7 @@ import com.google.android.maps.GeoPoint; import com.google.android.maps.MapView; import org.apache.commons.lang3.reflect.MethodUtils; +import org.eclipse.jdt.annotation.NonNull; import android.app.Activity; import android.content.Context; @@ -89,6 +90,7 @@ public class GoogleMapView extends MapView implements MapViewImpl { } @Override + @NonNull public GeoPointImpl getMapViewCenter() { GeoPoint point = getMapCenter(); return new GoogleGeoPoint(point.getLatitudeE6(), point.getLongitudeE6()); diff --git a/main/src/cgeo/geocaching/maps/interfaces/MapViewImpl.java b/main/src/cgeo/geocaching/maps/interfaces/MapViewImpl.java index c30f65f..5ae8e15 100644 --- a/main/src/cgeo/geocaching/maps/interfaces/MapViewImpl.java +++ b/main/src/cgeo/geocaching/maps/interfaces/MapViewImpl.java @@ -4,6 +4,8 @@ import cgeo.geocaching.geopoint.Viewport; import cgeo.geocaching.maps.CachesOverlay; import cgeo.geocaching.maps.PositionAndScaleOverlay; +import org.eclipse.jdt.annotation.NonNull; + import android.app.Activity; import android.content.Context; import android.graphics.drawable.Drawable; @@ -26,6 +28,7 @@ public interface MapViewImpl { void destroyDrawingCache(); + @NonNull GeoPointImpl getMapViewCenter(); int getLatitudeSpan(); @@ -73,7 +76,7 @@ public interface MapViewImpl { /** * Indicates if the current map view supports different themes * for map rendering - * + * * @return true - supports custom themes, false - does not support custom themes */ boolean hasMapThemes(); diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java index 6573304..30caed5 100644 --- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java +++ b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java @@ -13,6 +13,7 @@ import cgeo.geocaching.maps.interfaces.OnMapDragListener; import cgeo.geocaching.settings.Settings; import cgeo.geocaching.utils.Log; +import org.eclipse.jdt.annotation.NonNull; import org.mapsforge.android.mapsold.GeoPoint; import org.mapsforge.android.mapsold.MapDatabase; import org.mapsforge.android.mapsold.MapView; @@ -65,6 +66,7 @@ public class MapsforgeMapView024 extends MapView implements MapViewImpl { } @Override + @NonNull public GeoPointImpl getMapViewCenter() { GeoPoint point = getMapCenter(); return new MapsforgeGeoPoint(point.getLatitudeE6(), point.getLongitudeE6()); diff --git a/main/src/cgeo/geocaching/network/HtmlImage.java b/main/src/cgeo/geocaching/network/HtmlImage.java index 0019acc..f464e84 100644 --- a/main/src/cgeo/geocaching/network/HtmlImage.java +++ b/main/src/cgeo/geocaching/network/HtmlImage.java @@ -13,12 +13,14 @@ import cgeo.geocaching.utils.Log; import ch.boye.httpclientandroidlib.HttpResponse; import ch.boye.httpclientandroidlib.androidextra.Base64; + import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; + import rx.Observable; import rx.Observable.OnSubscribeFunc; import rx.Observer; @@ -123,9 +125,8 @@ public class HtmlImage implements Html.ImageGetter { } })); return null; - } else { - return drawable.toBlockingObservable().lastOrDefault(null); } + return drawable.toBlockingObservable().lastOrDefault(null); } public Observable<BitmapDrawable> fetchDrawable(final String url) { @@ -176,11 +177,10 @@ public class HtmlImage implements Html.ImageGetter { final BitmapDrawable image = loadResult.getLeft(); if (image != null) { return image; - } else { - return returnErrorImage ? - new BitmapDrawable(resources, BitmapFactory.decodeResource(resources, R.drawable.image_not_loaded)) : - getTransparent1x1Image(resources); } + return returnErrorImage ? + new BitmapDrawable(resources, BitmapFactory.decodeResource(resources, R.drawable.image_not_loaded)) : + getTransparent1x1Image(resources); } }).subscribe(observer); } diff --git a/main/src/cgeo/geocaching/network/OAuth.java b/main/src/cgeo/geocaching/network/OAuth.java index 1e22551..fa376af 100644 --- a/main/src/cgeo/geocaching/network/OAuth.java +++ b/main/src/cgeo/geocaching/network/OAuth.java @@ -3,6 +3,7 @@ package cgeo.geocaching.network; import cgeo.geocaching.utils.CryptUtils; import ch.boye.httpclientandroidlib.NameValuePair; + import org.apache.commons.lang3.StringUtils; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; @@ -36,13 +37,14 @@ public class OAuth { } final String keysPacked = consumerSecret + "&" + StringUtils.defaultString(tokenSecret); // both even if empty some of them! - final String requestPacked = method + "&" + OAuth.percentEncode((https ? "https" : "http") + "://" + host + path) + "&" + OAuth.percentEncode(StringUtils.join(paramsEncoded.toArray(), '&')); + final @NonNull String joinedParams = StringUtils.join(paramsEncoded.toArray(), '&'); + final String requestPacked = method + "&" + OAuth.percentEncode((https ? "https" : "http") + "://" + host + path) + "&" + OAuth.percentEncode(joinedParams); params.put("oauth_signature", CryptUtils.base64Encode(CryptUtils.hashHmac(requestPacked, keysPacked))); } /** * percent encode following http://tools.ietf.org/html/rfc5849#section-3.6 - * + * * @param url * @return */ diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java index ee97c13..6c3c984 100644 --- a/main/src/cgeo/geocaching/settings/Settings.java +++ b/main/src/cgeo/geocaching/settings/Settings.java @@ -54,8 +54,8 @@ public class Settings { private final static int unitsMetric = 1; // twitter api keys - private final static String keyConsumerPublic = CryptUtils.rot13("ESnsCvAv3kEupF1GCR3jGj"); - private final static String keyConsumerSecret = CryptUtils.rot13("7vQWceACV9umEjJucmlpFe9FCMZSeqIqfkQ2BnhV9x"); + private final static @NonNull String keyConsumerPublic = CryptUtils.rot13("ESnsCvAv3kEupF1GCR3jGj"); + private final static @NonNull String keyConsumerSecret = CryptUtils.rot13("7vQWceACV9umEjJucmlpFe9FCMZSeqIqfkQ2BnhV9x"); public enum CoordInputFormatEnum { Plain, @@ -694,10 +694,12 @@ public class Settings { return getBoolean(R.string.pref_skin, false); } + @NonNull public static String getKeyConsumerPublic() { return keyConsumerPublic; } + @NonNull public static String getKeyConsumerSecret() { return keyConsumerSecret; } diff --git a/main/src/cgeo/geocaching/utils/CryptUtils.java b/main/src/cgeo/geocaching/utils/CryptUtils.java index 5273fa5..80d841f 100644 --- a/main/src/cgeo/geocaching/utils/CryptUtils.java +++ b/main/src/cgeo/geocaching/utils/CryptUtils.java @@ -3,6 +3,7 @@ package cgeo.geocaching.utils; import org.apache.commons.lang3.CharEncoding; import org.apache.commons.lang3.StringUtils; +import org.eclipse.jdt.annotation.NonNull; import android.text.Spannable; import android.text.SpannableStringBuilder; @@ -66,6 +67,8 @@ public final class CryptUtils { } } + @SuppressWarnings("null") + @NonNull public static String rot13(String text) { if (text == null) { return StringUtils.EMPTY; diff --git a/main/src/cgeo/geocaching/utils/GeoDirHandler.java b/main/src/cgeo/geocaching/utils/GeoDirHandler.java index 7cfef89..64806e8 100644 --- a/main/src/cgeo/geocaching/utils/GeoDirHandler.java +++ b/main/src/cgeo/geocaching/utils/GeoDirHandler.java @@ -4,7 +4,6 @@ import cgeo.geocaching.CgeoApplication; import cgeo.geocaching.IGeoData; import cgeo.geocaching.settings.Settings; -import rx.Observable; import rx.Subscription; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/main/src/cgeo/geocaching/utils/LeastRecentlyUsedSet.java b/main/src/cgeo/geocaching/utils/LeastRecentlyUsedSet.java index 259e94a..0c83076 100644 --- a/main/src/cgeo/geocaching/utils/LeastRecentlyUsedSet.java +++ b/main/src/cgeo/geocaching/utils/LeastRecentlyUsedSet.java @@ -44,6 +44,7 @@ public class LeastRecentlyUsedSet<E> extends AbstractSet<E> * * @see HashSet */ + @SuppressWarnings("null") @NonNull @Override public Iterator<E> iterator() { |