mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 21:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Replaced TAGs

Browse source
This commit is contained in:
misaochan 2016-01-07 17:35:05 +13:00
parent 9c58e28371
commit 2384733934
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
View file

@ -51,6 +51,7 @@ public class CategorizationFragment extends SherlockFragment{
private ContentProviderClient client; private ContentProviderClient client;
private final int SEARCH_CATS_LIMIT = 25; private final int SEARCH_CATS_LIMIT = 25;
private static final String TAG = CategorizationFragment.class.getName();
public static class CategoryItem implements Parcelable { public static class CategoryItem implements Parcelable {
public String name; public String name;
@ -152,9 +153,9 @@ public class CategorizationFragment extends SherlockFragment{
} }
if (MwVolleyApi.GpsCatExists.getGpsCatExists() == true){ if (MwVolleyApi.GpsCatExists.getGpsCatExists() == true){
Log.d("Cat", "GPS cats found in CategorizationFragment.java" + MwVolleyApi.getGpsCat().toString()); Log.d(TAG, "GPS cats found in CategorizationFragment.java" + MwVolleyApi.getGpsCat().toString());
List<String> gpsItems = new ArrayList<String>(MwVolleyApi.getGpsCat()); List<String> gpsItems = new ArrayList<String>(MwVolleyApi.getGpsCat());
Log.d("Cat", "GPS items: " + gpsItems.toString()); Log.d(TAG, "GPS items: " + gpsItems.toString());
mergedItems.addAll(gpsItems); mergedItems.addAll(gpsItems);
} }
@ -165,7 +166,7 @@ public class CategorizationFragment extends SherlockFragment{
// faaaail // faaaail
throw new RuntimeException(e); throw new RuntimeException(e);
} }
Log.d("Cat", "Merged items: " + mergedItems.toString()); Log.d(TAG, "Merged items: " + mergedItems.toString());
return mergedItems; return mergedItems;
} }

4
commons/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java
View file

@ -174,11 +174,11 @@ public class MwVolleyApi {
private String printSet() { private String printSet() {
if (categorySet == null || categorySet.isEmpty()) { if (categorySet == null || categorySet.isEmpty()) {
GpsCatExists.setGpsCatExists(false); GpsCatExists.setGpsCatExists(false);
Log.d("Cat", "gpsCatExists=" + GpsCatExists.getGpsCatExists()); Log.d(TAG, "gpsCatExists=" + GpsCatExists.getGpsCatExists());
return "No collection of categories"; return "No collection of categories";
} else { } else {
GpsCatExists.setGpsCatExists(true); GpsCatExists.setGpsCatExists(true);
Log.d("Cat", "gpsCatExists=" + GpsCatExists.getGpsCatExists()); Log.d(TAG, "gpsCatExists=" + GpsCatExists.getGpsCatExists());
return "CATEGORIES FOUND" + categorySet.toString(); return "CATEGORIES FOUND" + categorySet.toString();
} }
} }

8
commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
View file

@ -64,7 +64,7 @@ public class ShareActivity
if (cacheFound == false) { if (cacheFound == false) {
//Has to be called after apiCall.request() //Has to be called after apiCall.request()
cacheObj.cacheData.cacheCategory(); cacheObj.cacheData.cacheCategory();
Log.d("Cache", "Cache the categories found"); Log.d(TAG, "Cache the categories found");
} }
uploadController.startUpload(title, mediaUri, description, mimeType, source, new UploadController.ContributionUploadProgress() { uploadController.startUpload(title, mediaUri, description, mimeType, source, new UploadController.ContributionUploadProgress() {
@ -187,7 +187,7 @@ public class ShareActivity
} }
mediaUriString = mediaUri.toString(); mediaUriString = mediaUri.toString();
Log.d("Image", "Uri: " + mediaUriString); Log.d(TAG, "Uri: " + mediaUriString);
//convert image Uri to file path //convert image Uri to file path
FilePathConverter uriObj = new FilePathConverter(this, mediaUri); FilePathConverter uriObj = new FilePathConverter(this, mediaUri);
String filePath = uriObj.getFilePath(); String filePath = uriObj.getFilePath();
@ -199,7 +199,7 @@ public class ShareActivity
if (filePath != null) { if (filePath != null) {
//extract the coordinates of image in decimal degrees //extract the coordinates of image in decimal degrees
Log.d("Image", "Calling GPSExtractor"); Log.d(TAG, "Calling GPSExtractor");
GPSExtractor imageObj = new GPSExtractor(filePath); GPSExtractor imageObj = new GPSExtractor(filePath);
//decimalCoords for MediaWiki API, xyCoords for Quadtree //decimalCoords for MediaWiki API, xyCoords for Quadtree
String decimalCoords = imageObj.getCoords(); String decimalCoords = imageObj.getCoords();
@ -208,7 +208,7 @@ public class ShareActivity
double decLatitude = imageObj.getDecLatitude(); double decLatitude = imageObj.getDecLatitude();
if (decimalCoords != null) { if (decimalCoords != null) {
Log.d("Coords", "Decimal coords of image: " + decimalCoords); Log.d(TAG, "Decimal coords of image: " + decimalCoords);
cacheObj.cacheData.setQtPoint(decLongitude, decLatitude); cacheObj.cacheData.setQtPoint(decLongitude, decLatitude);
MwVolleyApi apiCall = new MwVolleyApi(this); MwVolleyApi apiCall = new MwVolleyApi(this);