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

Refactor onRequestPermissionsResult to be simpler (#2965)

Browse source 
onRequestPermissionsResult has a switch statement with a single case, and a functionally empty default; this patch refactors it into an if statement to simplify the code. This patch also changes a C-style array declaration (String permissions[]) to the more standard Java style (String[] permissions).
This commit is contained in:
Dan Garry 2019-05-24 10:56:55 +01:00 • committed by neslihanturan
parent ab783a445f
commit 5f3510226a
1 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
View file

@ -470,28 +470,22 @@ public class MainActivity extends AuthenticatedActivity implements FragmentManag
@Override @Override
public void onRequestPermissionsResult(int requestCode, public void onRequestPermissionsResult(int requestCode,
String permissions[], int[] grantResults) { String[] permissions, int[] grantResults) {
switch (requestCode) { if (requestCode == LOCATION_REQUEST) {
case LOCATION_REQUEST: { // If request is cancelled, the result arrays are empty.
// If request is cancelled, the result arrays are empty. if (grantResults.length > 0
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) { Timber.d("Location permission given");
Timber.d("Location permission given"); ((ContributionsFragment)contributionsActivityPagerAdapter
((ContributionsFragment)contributionsActivityPagerAdapter .getItem(0)).locationManager.registerLocationManager();
.getItem(0)).locationManager.registerLocationManager(); } else {
} else { // If nearby fragment is visible and location permission is not given, send user back to contrib fragment
// If nearby fragment is visible and location permission is not given, send user back to contrib fragment if (!isContributionsFragmentVisible) {
if (!isContributionsFragmentVisible) { viewPager.setCurrentItem(CONTRIBUTIONS_TAB_POSITION);
viewPager.setCurrentItem(CONTRIBUTIONS_TAB_POSITION);
// TODO: If contrib fragment is visible and location permission is not given, display permission request button // TODO: If contrib fragment is visible and location permission is not given, display permission request button
}
} }
return;
} }
default:
return;
} }
} }