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

Add check for Android M

Browse source
This commit is contained in:
misaochan 2016-07-15 00:42:33 +12:00
parent ae7ed76943
commit 0832963f57
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
View file

@ -7,6 +7,7 @@ import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
@ -98,8 +99,8 @@ public class ContributionsListFragment extends Fragment {
public boolean onOptionsItemSelected(MenuItem item) {
switch(item.getItemId()) {
case R.id.menu_from_gallery:
//FIXME: Add permission request here. Only startActivity if permission has been granted
//Gallery crashes before reach ShareActivity screen so must implement check here
//Gallery crashes before reach ShareActivity screen so must implement permissions check here
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (ContextCompat.checkSelfPermission(this.getActivity(), Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
ActivityCompat.requestPermissions(this.getActivity(), new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, 1);
return true;
@ -107,6 +108,11 @@ public class ContributionsListFragment extends Fragment {
controller.startGalleryPick();
return true;
}
}
else {
controller.startGalleryPick();
return true;
}
case R.id.menu_from_camera:
controller.startCameraCapture();
return true;