From 895e3866488ed51d677f29c662a3de686f1803dd Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 18 Jul 2016 23:20:47 +1200 Subject: [PATCH 1/6] Add FIXME --- .../fr/free/nrw/commons/contributions/ContributionsActivity.java | 1 + .../free/nrw/commons/contributions/ContributionsListAdapter.java | 1 + 2 files changed, 2 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java index 7884af248..a4abe07c6 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java @@ -227,6 +227,7 @@ public class ContributionsActivity } + //FIXME: Potential cause of wrong image display bug public Media getMediaAtPosition(int i) { if (contributionsList.getAdapter() == null) { // not yet ready to return data diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java index 669ed0099..8ea7d9696 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java @@ -36,6 +36,7 @@ class ContributionsListAdapter extends CursorAdapter { return parent; } + //FIXME: Potential cause of wrong image display bug @Override public void bindView(View view, Context context, Cursor cursor) { final ContributionViewHolder views = (ContributionViewHolder)view.getTag(); From f42bc80f2f25fc264c23164243f9c36381385c17 Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 19 Jul 2016 16:36:46 +1200 Subject: [PATCH 2/6] Fixme added --- app/src/main/java/fr/free/nrw/commons/HandlerService.java | 1 + app/src/main/java/fr/free/nrw/commons/upload/UploadService.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/HandlerService.java b/app/src/main/java/fr/free/nrw/commons/HandlerService.java index f2e30ffec..e29d64fdd 100644 --- a/app/src/main/java/fr/free/nrw/commons/HandlerService.java +++ b/app/src/main/java/fr/free/nrw/commons/HandlerService.java @@ -16,6 +16,7 @@ public abstract class HandlerService extends Service { @Override public void handleMessage(Message msg) { + //FIXME: Google Photos bug handle(msg.what, (T)msg.obj); stopSelf(msg.arg1); } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java index 32482095b..2adb71776 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java @@ -111,6 +111,7 @@ public class UploadService extends HandlerService { protected void handle(int what, Contribution contribution) { switch(what) { case ACTION_UPLOAD_FILE: + //FIXME: Google Photos bug uploadContribution(contribution); break; default: @@ -173,6 +174,7 @@ public class UploadService extends HandlerService { String notificationTag = contribution.getLocalUri().toString(); try { + //FIXME: Google Photos bug file = this.getContentResolver().openInputStream(contribution.getLocalUri()); } catch(FileNotFoundException e) { Log.d("Exception", "File not found"); From c21c4e4748510858a0ac080c599a671ff3cc92b4 Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 19 Jul 2016 16:36:52 +1200 Subject: [PATCH 3/6] Fixme added --- .../free/nrw/commons/contributions/ContributionController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java index 58871d2cc..59de82442 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java @@ -61,6 +61,7 @@ public class ContributionController { } public void startGalleryPick() { + //FIXME: Starts gallery (opens Google Photos) Intent pickImageIntent = new Intent(Intent.ACTION_GET_CONTENT); pickImageIntent.setType("image/*"); fragment.startActivityForResult(pickImageIntent, SELECT_FROM_GALLERY); @@ -71,6 +72,7 @@ public class ContributionController { shareIntent.setAction(Intent.ACTION_SEND); switch(requestCode) { case SELECT_FROM_GALLERY: + //FIXME: Handles image picked from gallery (from Google Photos) shareIntent.setType(activity.getContentResolver().getType(data.getData())); shareIntent.putExtra(Intent.EXTRA_STREAM, data.getData()); shareIntent.putExtra(UploadService.EXTRA_SOURCE, fr.free.nrw.commons.contributions.Contribution.SOURCE_GALLERY); From daba60059bbff1e0d5fefd9b6958632f6eb1fd78 Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 19 Jul 2016 17:20:10 +1200 Subject: [PATCH 4/6] Add fixme --- .../nrw/commons/contributions/ContributionsListFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index 0e8f11814..68fc41675 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -88,6 +88,7 @@ public class ContributionsListFragment extends Fragment { @Override 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); if(resultCode == Activity.RESULT_OK) { controller.handleImagePicked(requestCode, data); From fd53b3662494c88dd6110f169ca01d989460766b Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 19 Jul 2016 17:31:08 +1200 Subject: [PATCH 5/6] Call getData() in onActivityForResult() --- .../nrw/commons/contributions/ContributionController.java | 4 ++-- .../commons/contributions/ContributionsListFragment.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java index 59de82442..881f70aa2 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java @@ -67,13 +67,13 @@ public class ContributionController { 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); shareIntent.setAction(Intent.ACTION_SEND); switch(requestCode) { case SELECT_FROM_GALLERY: //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(UploadService.EXTRA_SOURCE, fr.free.nrw.commons.contributions.Contribution.SOURCE_GALLERY); break; diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index 68fc41675..53d7a17e4 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -7,6 +7,7 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; +import android.net.Uri; import android.os.Build; import android.os.Bundle; 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.R; import fr.free.nrw.commons.SettingsActivity; +import fr.free.nrw.commons.upload.UploadService; public class ContributionsListFragment extends Fragment { @@ -90,9 +92,8 @@ 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); - if(resultCode == Activity.RESULT_OK) { - controller.handleImagePicked(requestCode, data); - } + Uri imageData = data.getData(); + controller.handleImagePicked(requestCode, imageData); } From e93ac7746deba9ab9b9fb95254a8b2062ae5828e Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 19 Jul 2016 17:33:08 +1200 Subject: [PATCH 6/6] Replace data with imageData --- .../nrw/commons/contributions/ContributionController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java index 881f70aa2..9cee652d3 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java @@ -73,8 +73,8 @@ public class ContributionController { switch(requestCode) { case SELECT_FROM_GALLERY: //FIXME: Handles image picked from gallery (from Google Photos) - shareIntent.setType(activity.getContentResolver().getType(data)); - shareIntent.putExtra(Intent.EXTRA_STREAM, data.getData()); + shareIntent.setType(activity.getContentResolver().getType(imageData)); + shareIntent.putExtra(Intent.EXTRA_STREAM, imageData); shareIntent.putExtra(UploadService.EXTRA_SOURCE, fr.free.nrw.commons.contributions.Contribution.SOURCE_GALLERY); break; case SELECT_FROM_CAMERA: