From 6c9b278801b1f1826158709333e5821237c6eade Mon Sep 17 00:00:00 2001 From: misaochan Date: Wed, 20 Jul 2016 17:49:55 +1200 Subject: [PATCH 1/8] Add log.e --- .../nrw/commons/contributions/ContributionsListFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 af69c14e9..df2257896 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 @@ -98,7 +98,7 @@ public class ContributionsListFragment extends Fragment { Uri imageData = data.getData(); controller.handleImagePicked(requestCode, imageData); } else { - Log.d("Contributions", "OnActivityResult() parameters: Result code: " + resultCode + " Data: null"); + Log.e("Contributions", "OnActivityResult() parameters: Result code: " + resultCode + " Data: null"); } } From 026ef6643707a7025cbbd22c3ccf2374d1953833 Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 21 Jul 2016 17:40:47 +1200 Subject: [PATCH 2/8] Whitespace --- app/src/main/AndroidManifest.xml | 4 ---- .../fr/free/nrw/commons/upload/MultipleShareActivity.java | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9fe916c5b..ab541eb4f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -44,9 +44,7 @@ > - - @@ -58,9 +56,7 @@ > - - diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java index 0aa135428..6baad2802 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java @@ -117,6 +117,8 @@ public class MultipleShareActivity .commit(); } + + public void onCategoriesSave(ArrayList categories) { if(categories.size() > 0) { ContentProviderClient client = getContentResolver().acquireContentProviderClient(ModificationsContentProvider.AUTHORITY); From 207521ef7391d456ce8ec24c796cd3abf0ececa5 Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 21 Jul 2016 17:45:09 +1200 Subject: [PATCH 3/8] Add runtime permission checking to MultipleShareActivity --- .../commons/upload/MultipleShareActivity.java | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java index 6baad2802..2b69bee85 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java @@ -2,12 +2,16 @@ package fr.free.nrw.commons.upload; import java.util.*; +import android.Manifest; import android.app.*; import android.content.*; +import android.content.pm.PackageManager; import android.database.DataSetObserver; import android.net.*; import android.os.*; +import android.support.v4.app.ActivityCompat; import android.support.v4.app.FragmentManager; +import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; import android.view.*; import android.view.inputmethod.InputMethodManager; @@ -77,6 +81,29 @@ public class MultipleShareActivity } public void OnMultipleUploadInitiated() { + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + //Check for Storage permission that is required for upload. Do not allow user to proceed without permission, otherwise will crash + if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { + ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, 1); + } else { + multipleUploadBegins(); + } + } else { + multipleUploadBegins(); + } + } + + @Override + public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) { + if (requestCode == 1) { + if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { + multipleUploadBegins(); + } + } + } + + private void multipleUploadBegins() { final ProgressDialog dialog = new ProgressDialog(MultipleShareActivity.this); dialog.setIndeterminate(false); dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); @@ -117,8 +144,6 @@ public class MultipleShareActivity .commit(); } - - public void onCategoriesSave(ArrayList categories) { if(categories.size() > 0) { ContentProviderClient client = getContentResolver().acquireContentProviderClient(ModificationsContentProvider.AUTHORITY); From 599f17559f90961f94623a22523405dda39bdfac Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 21 Jul 2016 17:46:41 +1200 Subject: [PATCH 4/8] Add log --- .../fr/free/nrw/commons/upload/MultipleShareActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java index 2b69bee85..cb1abe34e 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java @@ -13,6 +13,7 @@ import android.support.v4.app.ActivityCompat; import android.support.v4.app.FragmentManager; import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; +import android.util.Log; import android.view.*; import android.view.inputmethod.InputMethodManager; import android.widget.*; @@ -104,6 +105,9 @@ public class MultipleShareActivity } private void multipleUploadBegins() { + + Log.d("MultipleShareActivity", "Multiple upload begins"); + final ProgressDialog dialog = new ProgressDialog(MultipleShareActivity.this); dialog.setIndeterminate(false); dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); From 66ef5fbca746630e13c981bc4ddedc2f950e86fd Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 21 Jul 2016 17:59:44 +1200 Subject: [PATCH 5/8] Fix IllegalStateException --- .../fr/free/nrw/commons/upload/MultipleShareActivity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java index cb1abe34e..5fa881a60 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java @@ -107,7 +107,7 @@ public class MultipleShareActivity private void multipleUploadBegins() { Log.d("MultipleShareActivity", "Multiple upload begins"); - + final ProgressDialog dialog = new ProgressDialog(MultipleShareActivity.this); dialog.setIndeterminate(false); dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); @@ -145,7 +145,8 @@ public class MultipleShareActivity } getSupportFragmentManager().beginTransaction() .add(R.id.uploadsFragmentContainer, categorizationFragment, "categorization") - .commit(); + .commitAllowingStateLoss(); + //See http://stackoverflow.com/questions/7469082/getting-exception-illegalstateexception-can-not-perform-this-action-after-onsa } public void onCategoriesSave(ArrayList categories) { From 3e1d49bf4168f9fd1120f85bb110c7c6745a58e8 Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 21 Jul 2016 18:04:23 +1200 Subject: [PATCH 6/8] Versioning --- app/src/main/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ab541eb4f..9240c241c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="39" + android:versionName="1.21" > From 03de8e387f35d0d34eaad782974896871cde1824 Mon Sep 17 00:00:00 2001 From: Josephine Lim Date: Thu, 21 Jul 2016 18:05:54 +1200 Subject: [PATCH 7/8] Update changelog.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 585ee1a69..37bc223da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Wikimedia Commons for Android +##v1.21 +-Fixed Google Photos multiple share crash + ##v1.20 - Hotfix for data=null crash From c9c92100763b529aa8fb02a45bde982a5f3e3dbd Mon Sep 17 00:00:00 2001 From: Josephine Lim Date: Thu, 21 Jul 2016 18:06:17 +1200 Subject: [PATCH 8/8] Minor correction --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37bc223da..0c2f3c7e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Wikimedia Commons for Android ##v1.21 --Fixed Google Photos multiple share crash +- Fixed Google Photos multiple share crash ##v1.20 - Hotfix for data=null crash