From 03f3770a767e76de0dc63f794613199581291c33 Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 5 Sep 2016 17:12:11 +1200 Subject: [PATCH 1/4] Add return value --- .../nrw/commons/contributions/ContributionsListFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index 1c62a48bb..7adf4e5a8 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -165,6 +165,7 @@ public class ContributionsListFragment extends Fragment { Intent nearbyIntent = new Intent(getActivity(), NearbyActivity.class); startActivity(nearbyIntent); } + return true; case R.id.menu_refresh: ((SourceRefresher)getActivity()).refreshSource(); return true; From 273e44cbf0fe7f39110d182df1001b6e9311a244 Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 5 Sep 2016 17:23:41 +1200 Subject: [PATCH 2/4] Change all returns to true --- .../commons/contributions/ContributionsListFragment.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index 7adf4e5a8..e8750ad7d 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -117,7 +117,7 @@ public class ContributionsListFragment extends Fragment { if (ContextCompat.checkSelfPermission(this.getActivity(), Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { //See http://stackoverflow.com/questions/33169455/onrequestpermissionsresult-not-being-called-in-dialog-fragment requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, 1); - return false; + return true; } else { controller.startGalleryPick(); return true; @@ -155,17 +155,18 @@ public class ContributionsListFragment extends Fragment { if (ContextCompat.checkSelfPermission(this.getActivity(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) { //See http://stackoverflow.com/questions/33169455/onrequestpermissionsresult-not-being-called-in-dialog-fragment requestPermissions(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 2); - return false; + return true; } else { Intent nearbyIntent = new Intent(getActivity(), NearbyActivity.class); startActivity(nearbyIntent); + return true; } } else { Intent nearbyIntent = new Intent(getActivity(), NearbyActivity.class); startActivity(nearbyIntent); + return true; } - return true; case R.id.menu_refresh: ((SourceRefresher)getActivity()).refreshSource(); return true; From 608b4f86a42d9352bb576f4835315e3175147114 Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 5 Sep 2016 17:27:03 +1200 Subject: [PATCH 3/4] Add breaks to switch statement --- .../nrw/commons/contributions/ContributionsListFragment.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index e8750ad7d..ef27441a0 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -185,6 +185,7 @@ public class ContributionsListFragment extends Fragment { controller.startGalleryPick(); } } + break; // 2 = Location allowed when 'nearby places' selected case 2: { if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { @@ -193,6 +194,7 @@ public class ContributionsListFragment extends Fragment { startActivity(nearbyIntent); } } + break; } } From b3fd3571871315b8d100c997da904bf6ed09cf8a Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 5 Sep 2016 17:31:18 +1200 Subject: [PATCH 4/4] Add catch for NPE in NearbyListFragment' --- .../java/fr/free/nrw/commons/nearby/NearbyListFragment.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 5988bedcb..9b0ad4e42 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 @@ -165,7 +165,11 @@ public class NearbyListFragment extends ListFragment { } private void unlockScreenOrientation() { - getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR); + try { + getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR); + } catch (NullPointerException e){ + Log.e(TAG, "NPE: ", e); + } } private class NearbyAdapter extends ArrayAdapter {