From 8665264e0ec1022b6740a950ca38f349d4936acb Mon Sep 17 00:00:00 2001 From: veyndan Date: Tue, 28 Feb 2017 14:53:59 +0000 Subject: [PATCH 1/5] Add Checkstyle support --- app/build.gradle | 1 + app/quality.gradle | 23 ++++ script/style/checkstyle.xml | 222 ++++++++++++++++++++++++++++++++++++ 3 files changed, 246 insertions(+) create mode 100644 app/quality.gradle create mode 100644 script/style/checkstyle.xml diff --git a/app/build.gradle b/app/build.gradle index 898068b40..861dea5fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.application' +apply from: 'quality.gradle' dependencies { compile ('com.github.nicolas-raoul:Quadtree:211b6fe59ac48f') { diff --git a/app/quality.gradle b/app/quality.gradle new file mode 100644 index 000000000..e4cdd64e7 --- /dev/null +++ b/app/quality.gradle @@ -0,0 +1,23 @@ +apply plugin: 'checkstyle' + +check.dependsOn 'checkstyle' + +checkstyle { + toolVersion = '7.5.1' +} + +task checkstyle(type: Checkstyle) { + configFile file("${project.rootDir}/script/style/checkstyle.xml") + source 'src' + include '**/*.java' + exclude '**/gen/**' + + classpath = files() + + reports { + html { + enabled true + destination "$project.buildDir/reports/checkstyle/checkstyle.html" + } + } +} diff --git a/script/style/checkstyle.xml b/script/style/checkstyle.xml new file mode 100644 index 000000000..baebde870 --- /dev/null +++ b/script/style/checkstyle.xml @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d866ab3e075cab326f8935453c3d043c7a8e15b8 Mon Sep 17 00:00:00 2001 From: veyndan Date: Wed, 1 Mar 2017 15:44:32 +0000 Subject: [PATCH 2/5] Replace explicit type with diamond operator --- .../free/nrw/commons/CommonsApplication.java | 2 +- .../java/fr/free/nrw/commons/LicenseList.java | 2 +- .../main/java/fr/free/nrw/commons/Media.java | 6 ++-- .../free/nrw/commons/MediaDataExtractor.java | 6 ++-- .../nrw/commons/caching/CacheController.java | 4 +-- .../category/CategorizationFragment.java | 30 +++++++++---------- .../nrw/commons/category/MethodAUpdater.java | 4 +-- .../nrw/commons/category/PrefixUpdater.java | 12 ++++---- .../contributions/ContributionsActivity.java | 2 +- .../ContributionsSyncAdapter.java | 2 +- .../commons/media/CategoryImagesLoader.java | 2 +- .../commons/media/MediaDetailFragment.java | 2 +- .../modifications/ModifierSequence.java | 2 +- .../free/nrw/commons/nearby/NearbyPlaces.java | 2 +- .../commons/upload/MultipleShareActivity.java | 2 +- .../free/nrw/commons/upload/MwVolleyApi.java | 6 ++-- 16 files changed, 43 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java index 9e4482f0d..44bdf0336 100644 --- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java +++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java @@ -122,7 +122,7 @@ public class CommonsApplication extends Application { if (maxMem < 48L * 1024L * 1024L) { // Cache only one bitmap if VM memory is too small (such as Nexus One); Log.d("Commons", "Skipping bitmap cache; max mem is: " + maxMem); - imageCache = new LruCache(1); + imageCache = new LruCache<>(1); } else { int cacheSize = (int) (maxMem / (1024 * 8)); Log.d("Commons", "Bitmap cache size " + cacheSize + " from max mem " + maxMem); diff --git a/app/src/main/java/fr/free/nrw/commons/LicenseList.java b/app/src/main/java/fr/free/nrw/commons/LicenseList.java index 52049127c..a30728fb7 100644 --- a/app/src/main/java/fr/free/nrw/commons/LicenseList.java +++ b/app/src/main/java/fr/free/nrw/commons/LicenseList.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Set; public class LicenseList { - Map licenses = new HashMap(); + Map licenses = new HashMap<>(); Resources res; private static String XMLNS_LICENSE = "https://www.mediawiki.org/wiki/Extension:UploadWizard/xmlns/licenses"; 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 0b5b0fe00..f417f10b1 100644 --- a/app/src/main/java/fr/free/nrw/commons/Media.java +++ b/app/src/main/java/fr/free/nrw/commons/Media.java @@ -27,11 +27,11 @@ public class Media implements Parcelable { }; protected Media() { - this.categories = new ArrayList(); - this.descriptions = new HashMap(); + this.categories = new ArrayList<>(); + this.descriptions = new HashMap<>(); } - private HashMap tags = new HashMap(); + private HashMap tags = new HashMap<>(); public Object getTag(String key) { return tags.get(key); 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 b514ca524..67ec50a38 100644 --- a/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java +++ b/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java @@ -46,8 +46,8 @@ public class MediaDataExtractor { */ public MediaDataExtractor(String filename, LicenseList licenseList) { this.filename = filename; - categories = new ArrayList(); - descriptions = new HashMap(); + categories = new ArrayList<>(); + descriptions = new HashMap<>(); fetched = false; processed = false; this.licenseList = licenseList; @@ -251,7 +251,7 @@ public class MediaDataExtractor { // Texts are wrapped in things like {{en|foo} or {{en|1=foo bar}}. // Text outside those wrappers is stuffed into a 'default' faux language key if present. private Map getMultilingualText(Node parentNode) throws IOException { - Map texts = new HashMap(); + Map texts = new HashMap<>(); StringBuilder localText = new StringBuilder(); NodeList nodes = parentNode.getChildNodes(); 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 52586cab3..be5b4dff7 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 @@ -33,7 +33,7 @@ public class CacheController { } public void cacheCategory() { - List pointCatList = new ArrayList(); + List pointCatList = new ArrayList<>(); if (MwVolleyApi.GpsCatExists.getGpsCatExists() == true) { pointCatList.addAll(MwVolleyApi.getGpsCat()); Log.d(TAG, "Categories being cached: " + pointCatList); @@ -47,7 +47,7 @@ public class CacheController { //Convert decLatitude and decLongitude to a coordinate offset range convertCoordRange(); pointsFound = quadTree.searchWithin(xMinus, yMinus, xPlus, yPlus); - List displayCatList = new ArrayList(); + List displayCatList = new ArrayList<>(); Log.d(TAG, "Points found in quadtree: " + Arrays.asList(pointsFound)); if (pointsFound.length != 0) { diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 4bf2cc9ff..6ac48d628 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -69,14 +69,14 @@ public class CategorizationFragment extends Fragment { protected HashMap> categoriesCache; - private ArrayList selectedCategories = new ArrayList(); + private ArrayList selectedCategories = new ArrayList<>(); // LHS guarantees ordered insertions, allowing for prioritized method A results - private final Set results = new LinkedHashSet(); + private final Set results = new LinkedHashSet<>(); PrefixUpdater prefixUpdaterSub; MethodAUpdater methodAUpdaterSub; - private final ArrayList titleCatItems = new ArrayList(); + private final ArrayList titleCatItems = new ArrayList<>(); final CountDownLatch mergeLatch = new CountDownLatch(1); private ContentProviderClient client; @@ -164,7 +164,7 @@ public class CategorizationFragment extends Fragment { * @return a list containing recent categories */ protected ArrayList recentCatQuery() { - ArrayList items = new ArrayList(); + ArrayList items = new ArrayList<>(); try { Cursor cursor = client.query( @@ -192,16 +192,16 @@ public class CategorizationFragment extends Fragment { */ protected ArrayList mergeItems() { - Set mergedItems = new LinkedHashSet(); + Set mergedItems = new LinkedHashSet<>(); Log.d(TAG, "Calling APIs for GPS cats, title cats and recent cats..."); - List gpsItems = new ArrayList(); + List gpsItems = new ArrayList<>(); if (MwVolleyApi.GpsCatExists.getGpsCatExists()) { gpsItems.addAll(MwVolleyApi.getGpsCat()); } - List titleItems = new ArrayList(titleCatQuery()); - List recentItems = new ArrayList(recentCatQuery()); + List titleItems = new ArrayList<>(titleCatQuery()); + List recentItems = new ArrayList<>(recentCatQuery()); //Await results of titleItems, which is likely to come in last try { @@ -219,7 +219,7 @@ public class CategorizationFragment extends Fragment { Log.d(TAG, "Adding recent items: " + recentItems); //Needs to be an ArrayList and not a List unless we want to modify a big portion of preexisting code - ArrayList mergedItemsList = new ArrayList(mergedItems); + ArrayList mergedItemsList = new ArrayList<>(mergedItems); Log.d(TAG, "Merged item list: " + mergedItemsList); return mergedItemsList; @@ -233,8 +233,8 @@ public class CategorizationFragment extends Fragment { protected void setCatsAfterAsync(ArrayList categories, String filter) { if (getActivity() != null) { - ArrayList items = new ArrayList(); - HashSet existingKeys = new HashSet(); + ArrayList items = new ArrayList<>(); + HashSet existingKeys = new HashSet<>(); for (CategoryItem item : categoriesAdapter.getItems()) { if (item.selected) { items.add(item); @@ -282,7 +282,7 @@ public class CategorizationFragment extends Fragment { prefixUpdaterSub = new PrefixUpdater(this) { @Override protected ArrayList doInBackground(Void... voids) { - ArrayList result = new ArrayList(); + ArrayList result = new ArrayList<>(); try { result = super.doInBackground(); latch.await(); @@ -302,7 +302,7 @@ public class CategorizationFragment extends Fragment { Log.d(TAG, "Prefix result: " + result); String filter = categoriesFilter.getText().toString(); - ArrayList resultsList = new ArrayList(results); + ArrayList resultsList = new ArrayList<>(results); categoriesCache.put(filter, resultsList); Log.d(TAG, "Final results List: " + resultsList); @@ -424,8 +424,8 @@ public class CategorizationFragment extends Fragment { ArrayList items; if(savedInstanceState == null) { - items = new ArrayList(); - categoriesCache = new HashMap>(); + items = new ArrayList<>(); + categoriesCache = new HashMap<>(); } else { items = savedInstanceState.getParcelableArrayList("currentCategories"); categoriesCache = (HashMap>) savedInstanceState.getSerializable("categoriesCache"); diff --git a/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java index bc9a8092d..1856ffef3 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java +++ b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java @@ -83,7 +83,7 @@ public class MethodAUpdater extends AsyncTask> { //otherwise if user has typed something in that isn't in cache, search API for matching categories MWApi api = CommonsApplication.createMWApi(); ApiResult result; - ArrayList categories = new ArrayList(); + ArrayList categories = new ArrayList<>(); //URL https://commons.wikimedia.org/w/api.php?action=query&format=xml&list=search&srwhat=text&srenablerewrites=1&srnamespace=14&srlimit=10&srsearch= try { @@ -110,7 +110,7 @@ public class MethodAUpdater extends AsyncTask> { } Log.d(TAG, "Found categories from Method A search, waiting for filter"); - ArrayList filteredItems = new ArrayList(filterYears(categories)); + ArrayList filteredItems = new ArrayList<>(filterYears(categories)); return filteredItems; } } diff --git a/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java b/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java index d52564a81..bacd1a520 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java +++ b/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java @@ -82,17 +82,17 @@ public class PrefixUpdater extends AsyncTask> { protected ArrayList doInBackground(Void... voids) { //If user hasn't typed anything in yet, get GPS and recent items if(TextUtils.isEmpty(filter)) { - ArrayList mergedItems = new ArrayList(catFragment.mergeItems()); + ArrayList mergedItems = new ArrayList<>(catFragment.mergeItems()); Log.d(TAG, "Merged items, waiting for filter"); - ArrayList filteredItems = new ArrayList(filterYears(mergedItems)); + ArrayList filteredItems = new ArrayList<>(filterYears(mergedItems)); return filteredItems; } //if user types in something that is in cache, return cached category if(catFragment.categoriesCache.containsKey(filter)) { - ArrayList cachedItems = new ArrayList(catFragment.categoriesCache.get(filter)); + ArrayList cachedItems = new ArrayList<>(catFragment.categoriesCache.get(filter)); Log.d(TAG, "Found cache items, waiting for filter"); - ArrayList filteredItems = new ArrayList(filterYears(cachedItems)); + ArrayList filteredItems = new ArrayList<>(filterYears(cachedItems)); return filteredItems; } @@ -100,7 +100,7 @@ public class PrefixUpdater extends AsyncTask> { //URL: https://commons.wikimedia.org/w/api.php?action=query&list=allcategories&acprefix=filter&aclimit=25 MWApi api = CommonsApplication.createMWApi(); ApiResult result; - ArrayList categories = new ArrayList(); + ArrayList categories = new ArrayList<>(); try { result = api.action("query") .param("list", "allcategories") @@ -120,7 +120,7 @@ public class PrefixUpdater extends AsyncTask> { } Log.d(TAG, "Found categories from Prefix search, waiting for filter"); - ArrayList filteredItems = new ArrayList(filterYears(categories)); + ArrayList filteredItems = new ArrayList<>(filterYears(categories)); return filteredItems; } } diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java index 8a8313662..ff7af70e8 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java @@ -45,7 +45,7 @@ public class ContributionsActivity private MediaDetailPagerFragment mediaDetails; private UploadService uploadService; private boolean isUploadServiceConnected; - private ArrayList observersWaitingForLoad = new ArrayList(); + private ArrayList observersWaitingForLoad = new ArrayList<>(); private String CONTRIBUTION_SELECTION = ""; /* This sorts in the following order: diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java index 7f67db20a..9cb01e02c 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java @@ -92,7 +92,7 @@ public class ContributionsSyncAdapter extends AbstractThreadedSyncAdapter { ArrayList uploads = result.getNodes("/api/query/logevents/item"); Log.d("Commons", uploads.size() + " results!"); - ArrayList imageValues = new ArrayList(); + ArrayList imageValues = new ArrayList<>(); for(ApiResult image: uploads) { String filename = image.getString("@title"); if(fileExists(contentProviderClient, filename)) { diff --git a/app/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java b/app/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java index 3fbe830c1..6e9898ef1 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java +++ b/app/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java @@ -32,7 +32,7 @@ public class CategoryImagesLoader extends AsyncTaskLoader>{ @Override public List loadInBackground() { - ArrayList mediaList = new ArrayList(); + ArrayList mediaList = new ArrayList<>(); ApiResult result; try { result = app.getApi().action("query") diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index ada308cca..f15ccf01f 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -108,7 +108,7 @@ public class MediaDetailFragment extends Fragment { index = getArguments().getInt("index"); initialListTop = 0; } - categoryNames = new ArrayList(); + categoryNames = new ArrayList<>(); categoryNames.add(getString(R.string.detail_panel_cats_loading)); final View view = inflater.inflate(R.layout.fragment_media_detail, container, false); diff --git a/app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java b/app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java index 4869c3ee5..b660c0a72 100644 --- a/app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java +++ b/app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java @@ -21,7 +21,7 @@ public class ModifierSequence { public ModifierSequence(Uri mediaUri) { this.mediaUri = mediaUri; - modifiers = new ArrayList(); + modifiers = new ArrayList<>(); } public ModifierSequence(Uri mediaUri, JSONObject data) { diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java index 65239da9f..ac7fd3252 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java @@ -21,7 +21,7 @@ public class NearbyPlaces { } else { try { - places = new ArrayList(); + places = new ArrayList<>(); StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build(); StrictMode.setThreadPolicy(policy); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java index 6b85f62e8..3c9faff48 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java @@ -249,7 +249,7 @@ public class MultipleShareActivity if(intent.getAction().equals(Intent.ACTION_SEND_MULTIPLE)) { if(photosList == null) { - photosList = new ArrayList(); + photosList = new ArrayList<>(); ArrayList urisList = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM); for(int i=0; i < urisList.size(); i++) { Contribution up = new Contribution(); 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 a8cc93ec6..913e6bfd3 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 @@ -42,7 +42,7 @@ public class MwVolleyApi { public MwVolleyApi(Context context) { this.context = context; - categorySet = new HashSet(); + categorySet = new HashSet<>(); } public static List getGpsCat() { @@ -50,7 +50,7 @@ public class MwVolleyApi { } public static void setGpsCat(List cachedList) { - categoryList = new ArrayList(); + categoryList = new ArrayList<>(); categoryList.addAll(cachedList); Log.d(TAG, "Setting GPS cats from cache: " + categoryList.toString()); } @@ -236,7 +236,7 @@ public class MwVolleyApi { } } - categoryList = new ArrayList(categorySet); + categoryList = new ArrayList<>(categorySet); builder.replace(builder.length() - 1, builder.length(), ""); return builder.toString(); } From 8b6f11e9d23f4fd32248e755b52142dcfa35868b Mon Sep 17 00:00:00 2001 From: veyndan Date: Wed, 1 Mar 2017 15:53:55 +0000 Subject: [PATCH 3/5] Remove redundant interface modifiers --- .../nrw/commons/category/CategorizationFragment.java | 4 ++-- .../nrw/commons/media/MediaDetailPagerFragment.java | 10 +++++----- .../nrw/commons/upload/MultipleUploadListFragment.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 4bf2cc9ff..8d6cef7a3 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -52,8 +52,8 @@ import fr.free.nrw.commons.upload.MwVolleyApi; * Displays the category suggestion and selection screen. Category search is initiated here. */ public class CategorizationFragment extends Fragment { - public static interface OnCategoriesSaveHandler { - public void onCategoriesSave(ArrayList categories); + public interface OnCategoriesSaveHandler { + void onCategoriesSave(ArrayList categories); } ListView categoriesList; diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index 97c5981d8..16aacd4c2 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -46,11 +46,11 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa } public interface MediaDetailProvider { - public Media getMediaAtPosition(int i); - public int getTotalMediaCount(); - public void notifyDatasetChanged(); - public void registerDataSetObserver(DataSetObserver observer); - public void unregisterDataSetObserver(DataSetObserver observer); + Media getMediaAtPosition(int i); + int getTotalMediaCount(); + void notifyDatasetChanged(); + void registerDataSetObserver(DataSetObserver observer); + void unregisterDataSetObserver(DataSetObserver observer); } //FragmentStatePagerAdapter allows user to swipe across collection of images (no. of images undetermined) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java index 0aa2d285f..f9627adc5 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java @@ -36,7 +36,7 @@ import fr.free.nrw.commons.media.MediaDetailPagerFragment; public class MultipleUploadListFragment extends Fragment { public interface OnMultipleUploadInitiatedHandler { - public void OnMultipleUploadInitiated(); + void OnMultipleUploadInitiated(); } private GridView photosGrid; From d49706ef705e8e5f79af9095f6f2ea2d023c2941 Mon Sep 17 00:00:00 2001 From: veyndan Date: Wed, 1 Mar 2017 19:15:28 +0000 Subject: [PATCH 4/5] Remove unnecessary imports --- app/src/main/java/fr/free/nrw/commons/Utils.java | 5 ----- .../java/fr/free/nrw/commons/category/CategoriesAdapter.java | 2 -- .../fr/free/nrw/commons/category/CategorizationFragment.java | 3 --- .../java/fr/free/nrw/commons/category/MethodAUpdater.java | 1 - .../main/java/fr/free/nrw/commons/upload/ShareActivity.java | 2 -- 5 files changed, 13 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java index b38f6ed81..a00221e10 100644 --- a/app/src/main/java/fr/free/nrw/commons/Utils.java +++ b/app/src/main/java/fr/free/nrw/commons/Utils.java @@ -17,9 +17,6 @@ import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.StringWriter; @@ -39,8 +36,6 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.TransformerFactoryConfigurationError; -import fr.free.nrw.commons.upload.ShareActivity; - public class Utils { private static final String TAG = Utils.class.getName(); 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 4c4f85619..3359150c5 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 @@ -7,10 +7,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.CheckedTextView; -import android.widget.TextView; import java.util.ArrayList; -import java.util.TreeSet; import fr.free.nrw.commons.R; diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 4bf2cc9ff..0973bcf48 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -2,7 +2,6 @@ package fr.free.nrw.commons.category; import android.app.Activity; import android.content.ContentProviderClient; -import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; import android.database.Cursor; @@ -25,7 +24,6 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; -import android.widget.BaseAdapter; import android.widget.CheckedTextView; import android.widget.EditText; import android.widget.ListView; @@ -39,7 +37,6 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import java.util.TreeSet; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java index bc9a8092d..0eff4ff0f 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java +++ b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java @@ -1,7 +1,6 @@ package fr.free.nrw.commons.category; import android.os.AsyncTask; -import android.text.TextUtils; import android.util.Log; import android.view.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 f0420e912..897f2287e 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 @@ -21,10 +21,8 @@ import android.widget.Toast; import com.nostra13.universalimageloader.core.ImageLoader; -import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.math.BigInteger; import java.util.ArrayList; import java.util.List; From fe42731ee6bcdb9a5905d82ba3648c68b5a6e0ae Mon Sep 17 00:00:00 2001 From: veyndan Date: Wed, 1 Mar 2017 15:34:14 +0000 Subject: [PATCH 5/5] Replace fully qualified names with imports --- .../fr/free/nrw/commons/AboutActivity.java | 4 ++-- .../java/fr/free/nrw/commons/LicenseList.java | 18 +++++++++--------- .../fr/free/nrw/commons/SettingsActivity.java | 16 ++++++++-------- .../main/java/fr/free/nrw/commons/Utils.java | 9 ++++++--- .../auth/WikiAccountAuthenticatorService.java | 3 ++- .../category/CategorizationFragment.java | 3 ++- .../commons/contributions/Contribution.java | 4 ++-- .../contributions/ContributionController.java | 4 ++-- .../ContributionsListAdapter.java | 3 ++- .../nrw/commons/media/MediaDetailFragment.java | 8 ++++---- .../media/MediaDetailPagerFragment.java | 2 +- .../nrw/commons/upload/ExistingFileAsync.java | 2 +- .../upload/MultipleUploadListFragment.java | 3 ++- 13 files changed, 43 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java index 931267513..4fb9bc70b 100644 --- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java @@ -24,8 +24,8 @@ public class AboutActivity extends Activity { privacyPolicyText = (TextView) findViewById(R.id.about_privacy_policy); uploadsToText = (TextView) findViewById(R.id.about_uploads_to); - uploadsToText.setText(fr.free.nrw.commons.CommonsApplication.EVENTLOG_WIKI); - versionText.setText(fr.free.nrw.commons.CommonsApplication.APPLICATION_VERSION); + uploadsToText.setText(CommonsApplication.EVENTLOG_WIKI); + versionText.setText(CommonsApplication.APPLICATION_VERSION); // We can't use formatted strings directly because it breaks with // our localization tools. Grab an HTML string and turn it into diff --git a/app/src/main/java/fr/free/nrw/commons/LicenseList.java b/app/src/main/java/fr/free/nrw/commons/LicenseList.java index a30728fb7..9c791109e 100644 --- a/app/src/main/java/fr/free/nrw/commons/LicenseList.java +++ b/app/src/main/java/fr/free/nrw/commons/LicenseList.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Set; public class LicenseList { - Map licenses = new HashMap<>(); + Map licenses = new HashMap<>(); Resources res; private static String XMLNS_LICENSE = "https://www.mediawiki.org/wiki/Extension:UploadWizard/xmlns/licenses"; @@ -19,12 +19,12 @@ public class LicenseList { public LicenseList(Activity activity) { res = activity.getResources(); XmlPullParser parser = res.getXml(R.xml.wikimedia_licenses); - while (fr.free.nrw.commons.Utils.xmlFastForward(parser, XMLNS_LICENSE, "license")) { + while (Utils.xmlFastForward(parser, XMLNS_LICENSE, "license")) { String id = parser.getAttributeValue(null, "id"); String template = parser.getAttributeValue(null, "template"); String url = parser.getAttributeValue(null, "url"); String name = nameForTemplate(template); - fr.free.nrw.commons.License license = new fr.free.nrw.commons.License(id, template, url, name); + License license = new License(id, template, url, name); licenses.put(id, license); } } @@ -33,18 +33,18 @@ public class LicenseList { return licenses.keySet(); } - public Collection values() { + public Collection values() { return licenses.values(); } - public fr.free.nrw.commons.License get(String key) { + public License get(String key) { return licenses.get(key); } - public fr.free.nrw.commons.License licenseForTemplate(String template) { - String ucTemplate = fr.free.nrw.commons.Utils.capitalize(template); - for (fr.free.nrw.commons.License license : values()) { - if (ucTemplate.equals(fr.free.nrw.commons.Utils.capitalize(license.getTemplate()))) { + public License licenseForTemplate(String template) { + String ucTemplate = Utils.capitalize(template); + for (License license : values()) { + if (ucTemplate.equals(Utils.capitalize(license.getTemplate()))) { return license; } } diff --git a/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java b/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java index 970271567..38f655500 100644 --- a/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java @@ -13,7 +13,7 @@ import android.view.View; import android.view.ViewGroup; public class SettingsActivity extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener { - fr.free.nrw.commons.CommonsApplication app; + CommonsApplication app; private AppCompatDelegate mDelegate; @@ -23,7 +23,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer getDelegate().onCreate(savedInstanceState); super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.preferences); - ListPreference licensePreference = (ListPreference) findPreference(fr.free.nrw.commons.Prefs.DEFAULT_LICENSE); + ListPreference licensePreference = (ListPreference) findPreference(Prefs.DEFAULT_LICENSE); // WARNING: ORDERING NEEDS TO MATCH FOR THE LICENSE NAMES AND DISPLAY VALUES licensePreference.setEntries(new String[]{ getString(R.string.license_name_cc0), @@ -31,21 +31,21 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer getString(R.string.license_name_cc_by_sa) }); licensePreference.setEntryValues(new String[]{ - fr.free.nrw.commons.Prefs.Licenses.CC0, - fr.free.nrw.commons.Prefs.Licenses.CC_BY, - fr.free.nrw.commons.Prefs.Licenses.CC_BY_SA + Prefs.Licenses.CC0, + Prefs.Licenses.CC_BY, + Prefs.Licenses.CC_BY_SA }); - licensePreference.setSummary(getString(fr.free.nrw.commons.Utils.licenseNameFor(licensePreference.getValue()))); + licensePreference.setSummary(getString(Utils.licenseNameFor(licensePreference.getValue()))); licensePreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { - preference.setSummary(getString(fr.free.nrw.commons.Utils.licenseNameFor((String)newValue))); + preference.setSummary(getString(Utils.licenseNameFor((String)newValue))); return true; } }); - app = (fr.free.nrw.commons.CommonsApplication)getApplicationContext(); + app = (CommonsApplication)getApplicationContext(); } @Override diff --git a/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java index a00221e10..1463d20c7 100644 --- a/app/src/main/java/fr/free/nrw/commons/Utils.java +++ b/app/src/main/java/fr/free/nrw/commons/Utils.java @@ -31,10 +31,13 @@ import java.util.TimeZone; import java.util.concurrent.Executor; import java.util.regex.Pattern; +import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.TransformerFactoryConfigurationError; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; public class Utils { @@ -99,7 +102,7 @@ public class Utils { } public static String getStringFromDOM(Node dom) { - javax.xml.transform.Transformer transformer = null; + Transformer transformer = null; try { transformer = TransformerFactory.newInstance().newTransformer(); } catch (TransformerConfigurationException e) { @@ -111,8 +114,8 @@ public class Utils { } StringWriter outputStream = new StringWriter(); - javax.xml.transform.dom.DOMSource domSource = new javax.xml.transform.dom.DOMSource(dom); - javax.xml.transform.stream.StreamResult strResult = new javax.xml.transform.stream.StreamResult(outputStream); + DOMSource domSource = new DOMSource(dom); + StreamResult strResult = new StreamResult(outputStream); try { transformer.transform(domSource, strResult); diff --git a/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java b/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java index 8aa97191c..c5201f95a 100644 --- a/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java +++ b/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java @@ -1,5 +1,6 @@ package fr.free.nrw.commons.auth; +import android.accounts.AccountManager; import android.app.Service; import android.content.Intent; import android.os.IBinder; @@ -10,7 +11,7 @@ public class WikiAccountAuthenticatorService extends Service{ @Override public IBinder onBind(Intent intent) { - if (!intent.getAction().equals(android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT)) { + if (!intent.getAction().equals(AccountManager.ACTION_AUTHENTICATOR_INTENT)) { return null; } diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 5ff6c6af5..1d784b1c8 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -20,6 +20,7 @@ import android.util.Log; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -466,7 +467,7 @@ public class CategorizationFragment extends Fragment { } @Override - public void onCreateOptionsMenu(Menu menu, android.view.MenuInflater inflater) { + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { menu.clear(); inflater.inflate(R.menu.fragment_categorization, menu); } 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 62fedf592..83b3068a0 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 @@ -165,7 +165,7 @@ public class Contribution extends Media { public void save() { try { if(contentUri == null) { - contentUri = client.insert(fr.free.nrw.commons.contributions.ContributionsContentProvider.BASE_URI, this.toContentValues()); + contentUri = client.insert(ContributionsContentProvider.BASE_URI, this.toContentValues()); } else { client.update(contentUri, toContentValues(), null, null); } @@ -234,7 +234,7 @@ public class Contribution extends Media { //Check that cursor has a value to avoid CursorIndexOutOfBoundsException if (cursor.getCount() > 0) { - c.contentUri = fr.free.nrw.commons.contributions.ContributionsContentProvider.uriForId(cursor.getInt(0)); + c.contentUri = ContributionsContentProvider.uriForId(cursor.getInt(0)); c.filename = cursor.getString(1); c.localUri = TextUtils.isEmpty(cursor.getString(2)) ? null : Uri.parse(cursor.getString(2)); c.imageUrl = cursor.getString(3); 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 2a248dc10..dc45c64d1 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 @@ -76,12 +76,12 @@ public class ContributionController { Uri imageData = data.getData(); shareIntent.setType(activity.getContentResolver().getType(imageData)); shareIntent.putExtra(Intent.EXTRA_STREAM, imageData); - shareIntent.putExtra(UploadService.EXTRA_SOURCE, fr.free.nrw.commons.contributions.Contribution.SOURCE_GALLERY); + shareIntent.putExtra(UploadService.EXTRA_SOURCE, Contribution.SOURCE_GALLERY); break; case SELECT_FROM_CAMERA: shareIntent.setType("image/jpeg"); //FIXME: Find out appropriate mime type shareIntent.putExtra(Intent.EXTRA_STREAM, lastGeneratedCaptureURI); - shareIntent.putExtra(UploadService.EXTRA_SOURCE, fr.free.nrw.commons.contributions.Contribution.SOURCE_CAMERA); + shareIntent.putExtra(UploadService.EXTRA_SOURCE, Contribution.SOURCE_CAMERA); break; } Log.i("Image", "Image selected"); 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 bb4e5ffc5..53aba32b9 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 @@ -11,6 +11,7 @@ import android.view.View; import android.view.ViewGroup; import com.nostra13.universalimageloader.core.DisplayImageOptions; +import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.assist.FailReason; import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener; @@ -51,7 +52,7 @@ class ContributionsListAdapter extends CursorAdapter { mwImageView.setMedia(contribution, ((CommonsApplication) activity.getApplicationContext()).getImageLoader()); // FIXME: For transparent images } else { - com.nostra13.universalimageloader.core.ImageLoader.getInstance().displayImage(actualUrl, views.imageView, contributionDisplayOptions, new SimpleImageLoadingListener() { + ImageLoader.getInstance().displayImage(actualUrl, views.imageView, contributionDisplayOptions, new SimpleImageLoadingListener() { @Override public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) { diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index f15ccf01f..b20e93b96 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -39,7 +39,7 @@ public class MediaDetailFragment extends Fragment { private boolean editable; private DisplayImageOptions displayOptions; - private fr.free.nrw.commons.media.MediaDetailPagerFragment.MediaDetailProvider detailProvider; + private MediaDetailPagerFragment.MediaDetailProvider detailProvider; private int index; public static MediaDetailFragment forMedia(int index) { @@ -64,7 +64,7 @@ public class MediaDetailFragment extends Fragment { //private EditText title; private ProgressBar loadingProgress; private ImageView loadingFailed; - private fr.free.nrw.commons.media.MediaDetailSpacer spacer; + private MediaDetailSpacer spacer; private int initialListTop = 0; private TextView title; @@ -97,7 +97,7 @@ public class MediaDetailFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - detailProvider = (fr.free.nrw.commons.media.MediaDetailPagerFragment.MediaDetailProvider)getActivity(); + detailProvider = (MediaDetailPagerFragment.MediaDetailProvider)getActivity(); if(savedInstanceState != null) { editable = savedInstanceState.getBoolean("editable"); @@ -119,7 +119,7 @@ public class MediaDetailFragment extends Fragment { scrollView = (ScrollView) view.findViewById(R.id.mediaDetailScrollView); // Detail consists of a list view with main pane in header view, plus category list. - spacer = (fr.free.nrw.commons.media.MediaDetailSpacer) view.findViewById(R.id.mediaDetailSpacer); + spacer = (MediaDetailSpacer) view.findViewById(R.id.mediaDetailSpacer); title = (TextView) view.findViewById(R.id.mediaDetailTitle); desc = (TextView) view.findViewById(R.id.mediaDetailDesc); license = (TextView) view.findViewById(R.id.mediaDetailLicense); diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index 16aacd4c2..be755a6de 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -71,7 +71,7 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa } }, 5); } - return fr.free.nrw.commons.media.MediaDetailFragment.forMedia(i, editable); + return MediaDetailFragment.forMedia(i, editable); } @Override diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java b/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java index f22c59ab6..34a30285d 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/ExistingFileAsync.java @@ -24,7 +24,7 @@ import fr.free.nrw.commons.contributions.ContributionsActivity; */ public class ExistingFileAsync extends AsyncTask { - private static final String TAG = fr.free.nrw.commons.upload.ExistingFileAsync.class.getName(); + private static final String TAG = ExistingFileAsync.class.getName(); private String fileSHA1; private Context context; diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java index f9627adc5..01526d202 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java @@ -11,6 +11,7 @@ import android.text.TextWatcher; import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -200,7 +201,7 @@ public class MultipleUploadListFragment extends Fragment { } @Override - public void onCreateOptionsMenu(Menu menu, android.view.MenuInflater inflater) { + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); menu.clear(); inflater.inflate(R.menu.fragment_multiple_upload_list, menu);