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 pull request #285 from whym/cameraresult

Browse source 
Use resultCode == RESULT_OK instead of null check
This commit is contained in:
Josephine Lim 2016-10-04 17:54:32 +13:00 • committed by GitHub
commit 608117b918
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -67,12 +67,13 @@ public class ContributionController {
fragment.startActivityForResult(pickImageIntent, SELECT_FROM_GALLERY); fragment.startActivityForResult(pickImageIntent, SELECT_FROM_GALLERY);
} }
public void handleImagePicked(int requestCode, Uri imageData) { public void handleImagePicked(int requestCode, Intent data) {
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)
Uri imageData = data.getData();
shareIntent.setType(activity.getContentResolver().getType(imageData)); shareIntent.setType(activity.getContentResolver().getType(imageData));
shareIntent.putExtra(Intent.EXTRA_STREAM, imageData); shareIntent.putExtra(Intent.EXTRA_STREAM, imageData);
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);

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

@ -33,6 +33,8 @@ import fr.free.nrw.commons.SettingsActivity;
import fr.free.nrw.commons.nearby.NearbyActivity; import fr.free.nrw.commons.nearby.NearbyActivity;
import fr.free.nrw.commons.upload.UploadService; import fr.free.nrw.commons.upload.UploadService;
import static android.app.Activity.RESULT_OK;
public class ContributionsListFragment extends Fragment { public class ContributionsListFragment extends Fragment {
public interface SourceRefresher { public interface SourceRefresher {
@ -98,12 +100,11 @@ public class ContributionsListFragment extends Fragment {
//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 (data != null) { if ( resultCode == RESULT_OK ) {
Log.d("Contributions", "OnActivityResult() parameters: Result code: " + resultCode + " Data: " + data.toString()); Log.d("Contributions", "OnActivityResult() parameters: Req code: " + requestCode + " Result code: " + resultCode + " Data: " + data);
Uri imageData = data.getData(); controller.handleImagePicked(requestCode, data);
controller.handleImagePicked(requestCode, imageData);
} else { } else {
Log.e("Contributions", "OnActivityResult() parameters: Result code: " + resultCode + " Data: null"); Log.e("Contributions", "OnActivityResult() parameters: Req code: " + requestCode + " Result code: " + resultCode + " Data: " + data);
} }
} }