Merge remote-tracking branch 'refs/remotes/commons-app/master' into suggest-cats-from-title

This commit is contained in:
misaochan 2016-10-09 15:53:19 +13:00
commit 7ad2fc3b45
2 changed files with 7 additions and 9 deletions

View file

@ -98,10 +98,10 @@ public class GPSExtractor {
try {
exif = new ExifInterface(filePath);
} catch (IOException e) {
Log.w("Image", e);
Log.w(TAG, e);
return null;
} catch (IllegalArgumentException e) {
Log.w("Image", e);
Log.w(TAG, e);
return null;
}
@ -136,8 +136,8 @@ public class GPSExtractor {
longitude_ref = exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE_REF);
if (latitude!=null && latitude_ref!=null && longitude!=null && longitude_ref!=null) {
Log.d("Image", "Latitude: " + latitude + " " + latitude_ref);
Log.d("Image", "Longitude: " + longitude + " " + longitude_ref);
Log.d(TAG, "Latitude: " + latitude + " " + latitude_ref);
Log.d(TAG, "Longitude: " + longitude + " " + longitude_ref);
decimalCoords = getDecimalCoords(latitude, latitude_ref, longitude, longitude_ref);
return decimalCoords;
@ -201,7 +201,7 @@ public class GPSExtractor {
}
String decimalCoords = String.valueOf(decLatitude) + "|" + String.valueOf(decLongitude);
Log.d("Coords", "Latitude and Longitude are " + decimalCoords);
Log.d(TAG, "Latitude and Longitude are " + decimalCoords);
return decimalCoords;
}

View file

@ -59,7 +59,7 @@ public class MwVolleyApi {
public void request(String coords) {
coordsLog = coords;
String apiUrl = buildUrl(coords);
Log.d("Image", "URL: " + apiUrl);
Log.d(TAG, "URL: " + apiUrl);
JsonRequest<QueryResponse> request = new QueryRequest(apiUrl,
new LogResponseListener<QueryResponse>(), new LogResponseErrorListener());
@ -108,7 +108,6 @@ public class MwVolleyApi {
}
private static class LogResponseListener<T> implements Response.Listener<T> {
private static final String TAG = LogResponseListener.class.getName();
@Override
public void onResponse(T response) {
@ -117,7 +116,6 @@ public class MwVolleyApi {
}
private static class LogResponseErrorListener implements Response.ErrorListener {
private static final String TAG = LogResponseErrorListener.class.getName();
@Override
public void onErrorResponse(VolleyError error) {
@ -211,7 +209,7 @@ public class MwVolleyApi {
}
}
private static class Page {
public static class Page {
private int pageid;
private int ns;
private String title;