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

Call getData() in onActivityForResult()

Browse source
This commit is contained in:
misaochan 2016-07-19 17:31:08 +12:00
parent daba60059b
commit fd53b36624
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java
View file

@ -67,13 +67,13 @@ public class ContributionController {
fragment.startActivityForResult(pickImageIntent, SELECT_FROM_GALLERY); fragment.startActivityForResult(pickImageIntent, SELECT_FROM_GALLERY);
} }
public void handleImagePicked(int requestCode, Intent data) { public void handleImagePicked(int requestCode, Uri imageData) {
Intent shareIntent = new Intent(activity, ShareActivity.class); Intent shareIntent = new Intent(activity, ShareActivity.class);
shareIntent.setAction(Intent.ACTION_SEND); shareIntent.setAction(Intent.ACTION_SEND);
switch(requestCode) { switch(requestCode) {
case SELECT_FROM_GALLERY: case SELECT_FROM_GALLERY:
//FIXME: Handles image picked from gallery (from Google Photos) //FIXME: Handles image picked from gallery (from Google Photos)
shareIntent.setType(activity.getContentResolver().getType(data.getData())); shareIntent.setType(activity.getContentResolver().getType(data));
shareIntent.putExtra(Intent.EXTRA_STREAM, data.getData()); shareIntent.putExtra(Intent.EXTRA_STREAM, data.getData());
shareIntent.putExtra(UploadService.EXTRA_SOURCE, fr.free.nrw.commons.contributions.Contribution.SOURCE_GALLERY); shareIntent.putExtra(UploadService.EXTRA_SOURCE, fr.free.nrw.commons.contributions.Contribution.SOURCE_GALLERY);
break; break;

7
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.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
@ -29,6 +30,7 @@ import fr.free.nrw.commons.AboutActivity;
import fr.free.nrw.commons.CommonsApplication; import fr.free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.SettingsActivity; import fr.free.nrw.commons.SettingsActivity;
import fr.free.nrw.commons.upload.UploadService;
public class ContributionsListFragment extends Fragment { public class ContributionsListFragment extends Fragment {
@ -90,9 +92,8 @@ public class ContributionsListFragment extends Fragment {
public void onActivityResult(int requestCode, int resultCode, Intent data) { 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 //FIXME: must get the file data for Google Photos when receive the intent answer, in the onActivityResult method
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
if(resultCode == Activity.RESULT_OK) { Uri imageData = data.getData();
controller.handleImagePicked(requestCode, data); controller.handleImagePicked(requestCode, imageData);
}
} }