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

Don't create local vars when returning straight away

Browse source
This commit is contained in:
addshore 2017-05-13 13:01:05 +02:00
parent 85182e3fb7
commit f019aa2865
4 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/fr/free/nrw/commons/LicenseList.java
View file

@ -69,9 +69,8 @@ public class LicenseList {
int nameId = stringIdByName(stringId); int nameId = stringIdByName(stringId);
//Log.d("Commons", "LicenseList.nameForTemplate: nameId: " + nameId); //Log.d("Commons", "LicenseList.nameForTemplate: nameId: " + nameId);
if(nameId != 0) { if(nameId != 0) {
String name = res.getString(nameId);
//Log.d("Commons", "LicenseList.nameForTemplate: name: " + name); //Log.d("Commons", "LicenseList.nameForTemplate: name: " + name);
return name; return res.getString(nameId);
} }
return template; return template;
} }

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

@ -357,8 +357,7 @@ public class CategorizationFragment extends Fragment {
new String[] {name}, new String[] {name},
null); null);
if (cursor.moveToFirst()) { if (cursor.moveToFirst()) {
Category cat = Category.fromCursor(cursor); return Category.fromCursor(cursor);
return cat;
} }
} catch (RemoteException e) { } catch (RemoteException e) {
// This feels lazy, but to hell with checked exceptions. :) // This feels lazy, but to hell with checked exceptions. :)

3
app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java
View file

@ -108,7 +108,6 @@ public class MethodAUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
} }
Timber.d("Found categories from Method A search, waiting for filter"); Timber.d("Found categories from Method A search, waiting for filter");
ArrayList<String> filteredItems = new ArrayList<>(filterYears(categories)); return new ArrayList<>(filterYears(categories));
return filteredItems;
} }
} }

9
app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java
View file

@ -83,16 +83,14 @@ public class PrefixUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
if(TextUtils.isEmpty(filter)) { if(TextUtils.isEmpty(filter)) {
ArrayList<String> mergedItems = new ArrayList<>(catFragment.mergeItems()); ArrayList<String> mergedItems = new ArrayList<>(catFragment.mergeItems());
Timber.d("Merged items, waiting for filter"); Timber.d("Merged items, waiting for filter");
ArrayList<String> filteredItems = new ArrayList<>(filterYears(mergedItems)); return new ArrayList<>(filterYears(mergedItems));
return filteredItems;
} }
//if user types in something that is in cache, return cached category //if user types in something that is in cache, return cached category
if(catFragment.categoriesCache.containsKey(filter)) { if(catFragment.categoriesCache.containsKey(filter)) {
ArrayList<String> cachedItems = new ArrayList<>(catFragment.categoriesCache.get(filter)); ArrayList<String> cachedItems = new ArrayList<>(catFragment.categoriesCache.get(filter));
Timber.d("Found cache items, waiting for filter"); Timber.d("Found cache items, waiting for filter");
ArrayList<String> filteredItems = new ArrayList<>(filterYears(cachedItems)); return new ArrayList<>(filterYears(cachedItems));
return filteredItems;
} }
//otherwise if user has typed something in that isn't in cache, search API for matching categories //otherwise if user has typed something in that isn't in cache, search API for matching categories
@ -119,7 +117,6 @@ public class PrefixUpdater extends AsyncTask<Void, Void, ArrayList<String>> {
} }
Timber.d("Found categories from Prefix search, waiting for filter"); Timber.d("Found categories from Prefix search, waiting for filter");
ArrayList<String> filteredItems = new ArrayList<>(filterYears(categories)); return new ArrayList<>(filterYears(categories));
return filteredItems;
} }
} }