From 0993858272e94a667aa6fde826816a37b7fd41f1 Mon Sep 17 00:00:00 2001 From: veyndan Date: Sat, 4 Mar 2017 00:42:18 +0000 Subject: [PATCH 1/6] Remove redundant casts --- app/src/main/java/fr/free/nrw/commons/Media.java | 2 +- .../java/fr/free/nrw/commons/contributions/Contribution.java | 2 +- .../nrw/commons/contributions/ContributionController.java | 2 +- .../nrw/commons/contributions/ContributionsListAdapter.java | 4 ++-- .../java/fr/free/nrw/commons/nearby/NearbyListFragment.java | 2 +- .../main/java/fr/free/nrw/commons/upload/ShareActivity.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/Media.java b/app/src/main/java/fr/free/nrw/commons/Media.java index f417f10b1..366844a27 100644 --- a/app/src/main/java/fr/free/nrw/commons/Media.java +++ b/app/src/main/java/fr/free/nrw/commons/Media.java @@ -230,7 +230,7 @@ public class Media implements Parcelable { } public Media(Parcel in) { - localUri = (Uri)in.readParcelable(Uri.class.getClassLoader()); + localUri = in.readParcelable(Uri.class.getClassLoader()); imageUrl = in.readString(); filename = in.readString(); description = in.readString(); diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java index 83b3068a0..e59264099 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java @@ -85,7 +85,7 @@ public class Contribution extends Media { public Contribution(Parcel in) { super(in); - contentUri = (Uri)in.readParcelable(Uri.class.getClassLoader()); + contentUri = in.readParcelable(Uri.class.getClassLoader()); source = in.readString(); timestamp = (Date) in.readSerializable(); state = in.readInt(); diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java index dc45c64d1..6581e7381 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java @@ -98,7 +98,7 @@ public class ContributionController { public void loadState(Bundle savedInstanceState) { if(savedInstanceState != null) { - lastGeneratedCaptureURI = (Uri) savedInstanceState.getParcelable("lastGeneratedCaptureURI"); + lastGeneratedCaptureURI = savedInstanceState.getParcelable("lastGeneratedCaptureURI"); } } diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java index 53aba32b9..3a6aa72c3 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java @@ -48,7 +48,7 @@ class ContributionsListAdapter extends CursorAdapter { if(views.url == null || !views.url.equals(actualUrl)) { if(actualUrl.startsWith("http")) { - MediaWikiImageView mwImageView = (MediaWikiImageView)views.imageView; + MediaWikiImageView mwImageView = views.imageView; mwImageView.setMedia(contribution, ((CommonsApplication) activity.getApplicationContext()).getImageLoader()); // FIXME: For transparent images } else { @@ -65,7 +65,7 @@ class ContributionsListAdapter extends CursorAdapter { @Override public void onLoadingFailed(String imageUri, View view, FailReason failReason) { super.onLoadingFailed(imageUri, view, failReason); - MediaWikiImageView mwImageView = (MediaWikiImageView)views.imageView; + MediaWikiImageView mwImageView = views.imageView; mwImageView.setMedia(contribution, ((CommonsApplication) activity.getApplicationContext()).getImageLoader()); } }); 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 1471a51c2..b5664ef67 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 @@ -199,7 +199,7 @@ public class NearbyListFragment extends ListFragment implements TaskListener { @Override public View getView(int position, View convertView, ViewGroup parent) { // Get the data item for this position - Place place = (Place) getItem(position); + Place place = getItem(position); Log.d(TAG, "Place " + place.name); // Check if an existing view is being reused, otherwise inflate the view 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 483fa1228..3247f8123 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 @@ -229,7 +229,7 @@ public class ShareActivity Intent intent = getIntent(); if(intent.getAction().equals(Intent.ACTION_SEND)) { - mediaUri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM); + mediaUri = intent.getParcelableExtra(Intent.EXTRA_STREAM); if(intent.hasExtra(UploadService.EXTRA_SOURCE)) { source = intent.getStringExtra(UploadService.EXTRA_SOURCE); } else { From c605a9798a7ea4c1f717f5c70bb1cb17a8648795 Mon Sep 17 00:00:00 2001 From: veyndan Date: Sat, 4 Mar 2017 01:32:39 +0000 Subject: [PATCH 2/6] Remove unused layouts --- .../main/res/layout/activity_post_upload.xml | 8 --- app/src/main/res/layout/activity_signup.xml | 6 -- app/src/main/res/layout/login.xml | 60 ------------------- 3 files changed, 74 deletions(-) delete mode 100644 app/src/main/res/layout/activity_post_upload.xml delete mode 100644 app/src/main/res/layout/activity_signup.xml delete mode 100644 app/src/main/res/layout/login.xml diff --git a/app/src/main/res/layout/activity_post_upload.xml b/app/src/main/res/layout/activity_post_upload.xml deleted file mode 100644 index b22abd8c7..000000000 --- a/app/src/main/res/layout/activity_post_upload.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml deleted file mode 100644 index 165447f8c..000000000 --- a/app/src/main/res/layout/activity_signup.xml +++ /dev/null @@ -1,6 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/login.xml b/app/src/main/res/layout/login.xml deleted file mode 100644 index 69b5844cc..000000000 --- a/app/src/main/res/layout/login.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - -