diff --git a/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java b/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java index 44e7b8242..7be7a591f 100644 --- a/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java +++ b/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java @@ -1,7 +1,5 @@ package fr.free.nrw.commons; -import fr.free.nrw.commons.location.LatLng; - import org.mediawiki.api.ApiResult; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -22,6 +20,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import fr.free.nrw.commons.location.LatLng; import timber.log.Timber; /** @@ -32,12 +31,10 @@ import timber.log.Timber; */ public class MediaDataExtractor { private boolean fetched; - private boolean processed; private String filename; private ArrayList categories; private Map descriptions; - private String author; private Date date; private String license; private String coordinates; @@ -51,7 +48,7 @@ public class MediaDataExtractor { categories = new ArrayList<>(); descriptions = new HashMap<>(); fetched = false; - processed = false; + boolean processed = false; this.licenseList = licenseList; } @@ -122,7 +119,7 @@ public class MediaDataExtractor { descriptions = getMultilingualText(descriptionNode); Node authorNode = findTemplateParameter(templateNode, "author"); - author = getFlatText(authorNode); + String author = getFlatText(authorNode); } Node coordinateTemplateNode = findTemplate(doc.getDocumentElement(), "location"); diff --git a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java index 6889d4ef2..dab21a6e6 100644 --- a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java @@ -10,7 +10,6 @@ import butterknife.ButterKnife; import fr.free.nrw.commons.theme.BaseActivity; public class WelcomeActivity extends BaseActivity { - private WelcomePagerAdapter adapter; @BindView(R.id.welcomePager) ViewPager pager; @BindView(R.id.welcomePagerIndicator) CirclePageIndicator indicator; @@ -29,7 +28,7 @@ public class WelcomeActivity extends BaseActivity { } private void setUpAdapter() { - adapter = new WelcomePagerAdapter(this); + WelcomePagerAdapter adapter = new WelcomePagerAdapter(this); pager.setAdapter(adapter); indicator.setViewPager(pager); } diff --git a/app/src/main/java/fr/free/nrw/commons/caching/CacheController.java b/app/src/main/java/fr/free/nrw/commons/caching/CacheController.java index 3cf61385d..49fec4c2e 100644 --- a/app/src/main/java/fr/free/nrw/commons/caching/CacheController.java +++ b/app/src/main/java/fr/free/nrw/commons/caching/CacheController.java @@ -14,7 +14,6 @@ public class CacheController { private double x, y; private QuadTree> quadTree; - private Point>[] pointsFound; private double xMinus, xPlus, yMinus, yPlus; private static final int EARTH_RADIUS = 6378137; @@ -42,6 +41,7 @@ public class CacheController { } public List findCategory() { + Point>[] pointsFound; //Convert decLatitude and decLongitude to a coordinate offset range convertCoordRange(); pointsFound = quadTree.searchWithin(xMinus, yMinus, xPlus, yPlus); diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java b/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java index 3359150c5..5300b54ac 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategoriesAdapter.java @@ -14,13 +14,13 @@ import fr.free.nrw.commons.R; public class CategoriesAdapter extends BaseAdapter { - private Context context; private LayoutInflater mInflater; private ArrayList items; public CategoriesAdapter(Context context, ArrayList items) { - this.context = context; + Context localcontext; + localcontext = context; this.items = items; mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); } diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java index 2f786e2cd..1060cf25e 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java @@ -32,16 +32,15 @@ import fr.free.nrw.commons.theme.NavigationBaseActivity; import fr.free.nrw.commons.utils.UriSerializer; import timber.log.Timber; + public class NearbyActivity extends NavigationBaseActivity { + @BindView(R.id.progressBar) ProgressBar progressBar; private boolean isMapViewActive = false; private LocationServiceManager locationManager; private LatLng curLatLang; - private Gson gson; - private String gsonPlaceList; - private String gsonCurLatLng; private Bundle bundle; private NearbyAsyncTask nearbyAsyncTask; @@ -203,11 +202,11 @@ public class NearbyActivity extends NavigationBaseActivity { return; } - gson = new GsonBuilder() + Gson gson = new GsonBuilder() .registerTypeAdapter(Uri.class, new UriSerializer()) .create(); - gsonPlaceList = gson.toJson(placeList); - gsonCurLatLng = gson.toJson(curLatLang); + String gsonPlaceList = gson.toJson(placeList); + String gsonCurLatLng = gson.toJson(curLatLang); if (placeList.size() == 0) { int duration = Toast.LENGTH_SHORT; diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java index 731ee0035..bc9e22a3f 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java @@ -24,9 +24,7 @@ import fr.free.nrw.commons.utils.UriDeserializer; import timber.log.Timber; public class NearbyListFragment extends ListFragment { - private Gson gson; private List placeList; - private LatLng curLatLng; @BindView(R.id.listView) ListView listview; @@ -60,7 +58,7 @@ public class NearbyListFragment extends ListFragment { // Check that this is the first time view is created, // to avoid double list when screen orientation changed Bundle bundle = this.getArguments(); - gson = new GsonBuilder() + Gson gson = new GsonBuilder() .registerTypeAdapter(Uri.class, new UriDeserializer()) .create(); if (bundle != null) { @@ -69,7 +67,7 @@ public class NearbyListFragment extends ListFragment { Type listType = new TypeToken>() {}.getType(); placeList = gson.fromJson(gsonPlaceList, listType); Type curLatLngType = new TypeToken() {}.getType(); - curLatLng = gson.fromJson(gsonLatLng, curLatLngType); + LatLng curLatLng = gson.fromJson(gsonLatLng, curLatLngType); placeList = NearbyController.loadAttractionsFromLocationToPlaces(curLatLng, placeList); } if (savedInstanceState == null) { diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java index b58fa8d5b..b80d16313 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java @@ -31,8 +31,6 @@ import fr.free.nrw.commons.utils.UriDeserializer; public class NearbyMapFragment extends android.support.v4.app.Fragment { private MapView mapView; - private Gson gson; - private List placeList; private List baseMarkerOptionses; private fr.free.nrw.commons.location.LatLng curLatLng; @@ -44,14 +42,14 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); Bundle bundle = this.getArguments(); - gson = new GsonBuilder() + Gson gson = new GsonBuilder() .registerTypeAdapter(Uri.class, new UriDeserializer()) .create(); if (bundle != null) { String gsonPlaceList = bundle.getString("PlaceList"); String gsonLatLng = bundle.getString("CurLatLng"); Type listType = new TypeToken>() {}.getType(); - placeList = gson.fromJson(gsonPlaceList, listType); + List placeList = gson.fromJson(gsonPlaceList, listType); Type curLatLngType = new TypeToken() {}.getType(); curLatLng = gson.fromJson(gsonLatLng, curLatLngType); baseMarkerOptionses = NearbyController diff --git a/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java b/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java index e861a1803..6d1a2ac95 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java @@ -30,8 +30,7 @@ public class GPSExtractor { public boolean imageCoordsExists; private MyLocationListener myLocationListener; private LocationManager locationManager; - private String provider; - private Criteria criteria; + public GPSExtractor(String filePath, Context context){ this.filePath = filePath; @@ -54,8 +53,8 @@ public class GPSExtractor { */ protected void registerLocationManager() { locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE); - criteria = new Criteria(); - provider = locationManager.getBestProvider(criteria, true); + Criteria criteria = new Criteria(); + String provider = locationManager.getBestProvider(criteria, true); myLocationListener = new MyLocationListener(); try { diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java b/app/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java index 367309593..3058fabe4 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java @@ -33,7 +33,6 @@ public class MwVolleyApi { private static RequestQueue REQUEST_QUEUE; private static final Gson GSON = new GsonBuilder().create(); private Context context; - private String coordsLog; protected static Set categorySet; private static List categoryList; @@ -56,7 +55,7 @@ public class MwVolleyApi { } public void request(String coords) { - coordsLog = coords; + String coordsLog = coords; String apiUrl = buildUrl(coords); Timber.d("URL: %s", apiUrl); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java index cffdd35f0..0efa37889 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java @@ -47,7 +47,6 @@ public class ShareActivity implements SingleUploadFragment.OnUploadActionInitiated, CategorizationFragment.OnCategoriesSaveHandler { - private SingleUploadFragment shareView; private CategorizationFragment categorizationFragment; private CommonsApplication app; @@ -59,13 +58,13 @@ public class ShareActivity private Uri mediaUri; private Contribution contribution; private SimpleDraweeView backgroundImageView; + private UploadController uploadController; private CommonsApplication cacheObj; private boolean cacheFound; private GPSExtractor imageObj; - private String filePath; private String decimalCoords; private boolean useNewPermissions = false; @@ -194,7 +193,7 @@ public class ShareActivity protected void onAuthCookieAcquired(String authCookie) { app.getMWApi().setAuthCookie(authCookie); - shareView = (SingleUploadFragment) getSupportFragmentManager().findFragmentByTag("shareView"); + SingleUploadFragment shareView = (SingleUploadFragment) getSupportFragmentManager().findFragmentByTag("shareView"); categorizationFragment = (CategorizationFragment) getSupportFragmentManager().findFragmentByTag("categorization"); if(shareView == null && categorizationFragment == null) { shareView = new SingleUploadFragment(); @@ -375,7 +374,7 @@ public class ShareActivity * @param gpsEnabled */ public void getFileMetadata(boolean gpsEnabled) { - filePath = FileUtils.getPath(this, mediaUri); + String filePath = FileUtils.getPath(this, mediaUri); Timber.d("Filepath: %s", filePath); Timber.d("Calling GPSExtractor"); if(imageObj == null) {