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

Merge remote-tracking branch 'refs/remotes/origin/master' into webview-activity

Browse source
This commit is contained in:
misaochan 2016-08-09 17:54:08 +12:00
commit b3b1c99435
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,5 +1,9 @@
# Wikimedia Commons for Android
##v1.24
- Moved from bits/event.gif to wikimedia/beacon
- Fixed issue with needing to tap gallery again after giving permissions
##v1.23
- Added warning if image is submitted without categories
- Added check if back button is pressed at category selection screen

4
app/src/main/AndroidManifest.xml
View file

@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="fr.free.nrw.commons"
android:versionCode="41"
android:versionName="1.23" >
android:versionCode="42"
android:versionName="1.24" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

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

@ -114,8 +114,9 @@ public class ContributionsListFragment extends Fragment {
//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;
//See http://stackoverflow.com/questions/33169455/onrequestpermissionsresult-not-being-called-in-dialog-fragment
requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, 1);
return false;
} else {
controller.startGalleryPick();
return true;
@ -159,18 +160,14 @@ public class ContributionsListFragment extends Fragment {
}
@Override
public void onRequestPermissionsResult(int requestCode,
String permissions[], int[] grantResults) {
public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
switch (requestCode) {
// 1 = Storage allowed when gallery selected
case 1: {
if (grantResults.length > 0
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
Log.d("ContributionsList", "Call controller.startGalleryPick()");
controller.startGalleryPick();
} else {
return;
}
return;
}
}
}