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

Merge pull request #198 from misaochan/on-activity-result-npe

Browse source 
Hotfix for recent crash
This commit is contained in:
Nicolas Raoul 2016-07-20 14:29:23 +09:00 • committed by GitHub
commit 2f95a79abd
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -1,5 +1,8 @@
# Wikimedia Commons for Android
##v1.20
- Hotfix for data=null crash
##v1.19
- Fixed adapter crash
- Attempt at fixing Google Photos crash

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="37"
android:versionName="1.19" >
android:versionCode="38"
android:versionName="1.20" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

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

@ -92,8 +92,14 @@ public class ContributionsListFragment extends Fragment {
public void onActivityResult(int requestCode, int resultCode, Intent data) {
//FIXME: must get the file data for Google Photos when receive the intent answer, in the onActivityResult method
super.onActivityResult(requestCode, resultCode, data);
Uri imageData = data.getData();
controller.handleImagePicked(requestCode, imageData);
if (data != null) {
Log.d("Contributions", "OnActivityResult() parameters: Result code: " + resultCode + " Data: " + data.toString());
Uri imageData = data.getData();
controller.handleImagePicked(requestCode, imageData);
} else {
Log.d("Contributions", "OnActivityResult() parameters: Result code: " + resultCode + " Data: null");
}
}