From 12d9c28d46d5c4a7a092c0dc2e35874d5a240c29 Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Sun, 3 Mar 2019 10:04:09 +0530 Subject: [PATCH 01/18] crop image activity --- app/build.gradle | 2 ++ app/proguard-rules.txt | 1 + app/src/main/AndroidManifest.xml | 2 ++ .../fr/free/nrw/commons/upload/UploadActivity.java | 14 ++++++++++++++ .../free/nrw/commons/upload/UploadPresenter.java | 5 +++++ .../fr/free/nrw/commons/upload/UploadView.java | 2 ++ .../res/layout/activity_upload_bottom_card.xml | 5 +++++ 7 files changed, 31 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 93d43f1a6d..c238e30c6d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -91,6 +91,8 @@ dependencies { implementation 'com.daimajia.swipelayout:library:1.2.0@aar' implementation 'com.nineoldandroids:library:2.4.0' implementation files('libs/icafe-1.1-SNAPSHOT.jar') + //image crop + implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.+' } android { diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt index d023294dce..ab03788bb7 100644 --- a/app/proguard-rules.txt +++ b/app/proguard-rules.txt @@ -70,3 +70,4 @@ -keep class org.acra.** { *; } -keepattributes SourceFile,LineNumberTable -keepattributes *Annotation* +-keep class android.support.v7.widget.** { *; } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b1f15c0c26..4eb68b66ce 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -119,6 +119,8 @@ + categoriesAdapter; @@ -154,6 +156,7 @@ protected void onCreate(Bundle savedInstanceState) { configureCategories(); configureLicenses(); configurePolicy(); + configureEditImage(); presenter.init(); @@ -424,6 +427,12 @@ public void hideProgressDialog() { } } + @Override + public void openCropImage(Uri uri) { + CropImage.activity(uri) + .start(this); + } + @Override public void launchMapActivity(String decCoords) { Utils.handleGeoCoordinates(this, decCoords); @@ -508,6 +517,11 @@ private void configureLayout() { background.setOnScaleChangeListener((scaleFactor, x, y) -> presenter.closeAllCards()); } + private void configureEditImage() { + editImages.setOnClickListener(v -> { presenter.editImages(); + }); + } + private void configureTopCard() { topCardExpandButton.setOnClickListener(v -> presenter.toggleTopCardState()); topCardThumbnails.setLayoutManager(new LinearLayoutManager(this, diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java index 05d13ed9d4..80fb3de4fb 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.net.Uri; import java.lang.reflect.Proxy; import java.util.ArrayList; @@ -135,6 +136,10 @@ private void handleImage(Title title, List descriptions, Integer im } } + void editImages(ArrayList uri){ + view.openCropImage(uri.get(0)); + } + /** * Called by the next button in {@link UploadActivity} */ diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java index 19c27119ba..7cf2ae4d91 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java @@ -85,4 +85,6 @@ public interface UploadView { void showProgressDialog(); void hideProgressDialog(); + + void openCropImage(Uri uri); } diff --git a/app/src/main/res/layout/activity_upload_bottom_card.xml b/app/src/main/res/layout/activity_upload_bottom_card.xml index 5d529335a4..76d4be96e8 100644 --- a/app/src/main/res/layout/activity_upload_bottom_card.xml +++ b/app/src/main/res/layout/activity_upload_bottom_card.xml @@ -104,6 +104,11 @@ android:layout_marginBottom="8dp" android:visibility="visible" app:srcCompat="@drawable/ic_map_white_24dp" /> + From d1a14dd99bbbca102142677598387c506b1cb8a8 Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Sun, 3 Mar 2019 11:28:08 +0530 Subject: [PATCH 02/18] loading image cropping --- .../nrw/commons/upload/UploadActivity.java | 23 +++++++++++++++---- .../nrw/commons/upload/UploadPresenter.java | 6 +++-- .../layout/activity_upload_bottom_card.xml | 4 ++-- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java index a1393c2aa1..1db418527e 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java @@ -6,6 +6,7 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.os.Parcelable; import android.support.design.widget.TextInputLayout; import android.support.v7.app.AlertDialog; import android.support.v7.widget.CardView; @@ -101,7 +102,7 @@ public class UploadActivity extends BaseActivity implements UploadView, SimilarI @BindView(R.id.bottom_card_expand_button) ImageView bottomCardExpandButton; @BindView(R.id.bottom_card_title) TextView bottomCardTitle; @BindView(R.id.bottom_card_subtitle) TextView bottomCardSubtitle; - @BindView(R.id.bottom_card_next) Button next; + @BindView(R.id.editImage) Button next; @BindView(R.id.bottom_card_previous) Button previous; @BindView(R.id.bottom_card_add_desc) Button bottomCardAddDescription; @BindView(R.id.categories_subtitle) TextView categoriesSubtitle; @@ -130,7 +131,7 @@ public class UploadActivity extends BaseActivity implements UploadView, SimilarI @BindView(R.id.submit) Button submit; @BindView(R.id.license_previous) Button licensePrevious; @BindView(R.id.rv_descriptions) RecyclerView rvDescriptions; - @BindView(R.id.editImage) ImageView editImages; + @BindView(R.id.bottom_card_next) ImageView editImages; private DescriptionsAdapter descriptionsAdapter; private RVRendererAdapter categoriesAdapter; @@ -147,6 +148,8 @@ protected void onCreate(Bundle savedInstanceState) { ButterKnife.bind(this); compositeDisposable = new CompositeDisposable(); + ArrayList files= getIntent().getParcelableArrayListExtra(EXTRA_FILES); + configureLayout(); configureTopCard(); configureBottomCard(); @@ -156,7 +159,7 @@ protected void onCreate(Bundle savedInstanceState) { configureCategories(); configureLicenses(); configurePolicy(); - configureEditImage(); + configureEditImage(files); presenter.init(); @@ -429,6 +432,7 @@ public void hideProgressDialog() { @Override public void openCropImage(Uri uri) { + Timber.d(uri.toString()); CropImage.activity(uri) .start(this); } @@ -454,6 +458,14 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == CommonsApplication.OPEN_APPLICATION_DETAIL_SETTINGS) { //TODO: Confirm if handling manual permission enabled is required } + if (requestCode == CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE) { + CropImage.ActivityResult result = CropImage.getActivityResult(data); + if (resultCode == RESULT_OK) { + Uri resultUri = result.getUri(); + } else if (resultCode == CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE) { + Exception error = result.getError(); + } + } } /** @@ -517,9 +529,10 @@ private void configureLayout() { background.setOnScaleChangeListener((scaleFactor, x, y) -> presenter.closeAllCards()); } - private void configureEditImage() { - editImages.setOnClickListener(v -> { presenter.editImages(); + private void configureEditImage(ArrayList uri) { + editImages.setOnClickListener(v -> {presenter.editImages(Uri.fromFile(uri.get(0).getFile())); }); + //openCropImage(Uri.fromFile(uri.get(0).getFile())); } private void configureTopCard() { diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java index 80fb3de4fb..1ab12dbacd 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java @@ -3,6 +3,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.net.Uri; +import android.os.Parcelable; import java.lang.reflect.Proxy; import java.util.ArrayList; @@ -136,8 +137,9 @@ private void handleImage(Title title, List descriptions, Integer im } } - void editImages(ArrayList uri){ - view.openCropImage(uri.get(0)); + void editImages(Uri uri){ + String path="data/user/0/fr.free.nrw.commons/cache/CommonsContributions/8b1e3cd5-7fb9-489f-a2f5-ad1ccf6368e5.jpg"; + view.openCropImage(uri); } /** diff --git a/app/src/main/res/layout/activity_upload_bottom_card.xml b/app/src/main/res/layout/activity_upload_bottom_card.xml index 76d4be96e8..487ed91e84 100644 --- a/app/src/main/res/layout/activity_upload_bottom_card.xml +++ b/app/src/main/res/layout/activity_upload_bottom_card.xml @@ -104,7 +104,7 @@ android:layout_marginBottom="8dp" android:visibility="visible" app:srcCompat="@drawable/ic_map_white_24dp" /> - - Date: Tue, 5 Mar 2019 15:44:18 +0530 Subject: [PATCH 03/18] option to edit an image --- .../fr/free/nrw/commons/upload/UploadActivity.java | 10 ++++++++-- .../fr/free/nrw/commons/upload/UploadPresenter.java | 5 ++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java index 1db418527e..58a30f6b1e 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java @@ -137,6 +137,7 @@ public class UploadActivity extends BaseActivity implements UploadView, SimilarI private RVRendererAdapter categoriesAdapter; private CompositeDisposable compositeDisposable; private ProgressDialog progressDialog; + private static boolean updatedImage =false; @SuppressLint("CheckResult") @@ -369,6 +370,7 @@ public void setRightCardState(boolean state) { @Override public void setBackground(Uri mediaUri) { + if (!updatedImage) background.setImageURI(mediaUri); } @@ -458,10 +460,14 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == CommonsApplication.OPEN_APPLICATION_DETAIL_SETTINGS) { //TODO: Confirm if handling manual permission enabled is required } + Uri resultUri; if (requestCode == CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE) { CropImage.ActivityResult result = CropImage.getActivityResult(data); if (resultCode == RESULT_OK) { - Uri resultUri = result.getUri(); + resultUri = result.getUri(); + updatedImage=true; + background.setImageURI(resultUri); + background.setScaleType(ImageView.ScaleType.CENTER_CROP); } else if (resultCode == CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE) { Exception error = result.getError(); } @@ -530,7 +536,7 @@ private void configureLayout() { } private void configureEditImage(ArrayList uri) { - editImages.setOnClickListener(v -> {presenter.editImages(Uri.fromFile(uri.get(0).getFile())); + editImages.setOnClickListener(v -> {presenter.editImages(uri); }); //openCropImage(Uri.fromFile(uri.get(0).getFile())); } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java index 1ab12dbacd..1454625fa7 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java @@ -137,9 +137,8 @@ private void handleImage(Title title, List descriptions, Integer im } } - void editImages(Uri uri){ - String path="data/user/0/fr.free.nrw.commons/cache/CommonsContributions/8b1e3cd5-7fb9-489f-a2f5-ad1ccf6368e5.jpg"; - view.openCropImage(uri); + void editImages(ArrayList uri){ + view.openCropImage(Uri.fromFile(uri.get(0).getFile())); } /** From 604baabf43514fc1906d5d7b20326da067ed546d Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Tue, 5 Mar 2019 22:16:30 +0530 Subject: [PATCH 04/18] cropping image for one and ui for multiple --- app/build.gradle | 13 +- app/src/main/AndroidManifest.xml | 71 +- .../commons/upload/EditUploadActivity.java | 68 ++ .../free/nrw/commons/upload/ImageAdapter.java | 62 ++ .../nrw/commons/upload/UploadActivity.java | 29 +- .../free/nrw/commons/upload/UploadModel.java | 8 +- .../nrw/commons/upload/UploadPresenter.java | 18 +- .../free/nrw/commons/upload/UploadView.java | 5 + .../main/res/layout/activity_edit_upload.xml | 31 + .../layout/activity_upload_bottom_card.xml | 21 +- app/src/main/res/values/strings.xml | 883 +++++++++--------- 11 files changed, 706 insertions(+), 503 deletions(-) create mode 100644 app/src/main/java/fr/free/nrw/commons/upload/EditUploadActivity.java create mode 100644 app/src/main/java/fr/free/nrw/commons/upload/ImageAdapter.java create mode 100644 app/src/main/res/layout/activity_edit_upload.xml diff --git a/app/build.gradle b/app/build.gradle index c238e30c6d..31f2ece7bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ apply from: 'quality.gradle' def isRunningOnTravisAndIsNotPRBuild = System.getenv("CI") == "true" && file('../play.p12').exists() -if(isRunningOnTravisAndIsNotPRBuild) { +if (isRunningOnTravisAndIsNotPRBuild) { apply plugin: 'com.github.triplet.play' } @@ -93,6 +93,7 @@ dependencies { implementation files('libs/icafe-1.1-SNAPSHOT.jar') //image crop implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.+' + implementation 'com.squareup.picasso:picasso:2.5.2' } android { @@ -128,7 +129,7 @@ android { test.resources.srcDirs += 'src/main/resoures' } - signingConfigs { + signingConfigs { release } @@ -137,7 +138,7 @@ android { minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' testProguardFile 'test-proguard-rules.txt' - if(isRunningOnTravisAndIsNotPRBuild) { + if (isRunningOnTravisAndIsNotPRBuild) { signingConfig signingConfigs.release } } @@ -149,7 +150,7 @@ android { versionNameSuffix "-debug-" + getBranchName() } } - + if (isRunningOnTravisAndIsNotPRBuild) { // configure keystore based on env vars in Travis for automated alpha builds signingConfigs.release.storeFile = file("../nr-commons.keystore") @@ -162,7 +163,7 @@ android { productFlavors { prod { - applicationId 'fr.free.nrw.commons' + applicationId 'fr.free.nrw.commons' buildConfigField "String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\"" buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.org/w/api.php\"" @@ -235,7 +236,7 @@ android { buildToolsVersion buildToolsVersion } -if(isRunningOnTravisAndIsNotPRBuild) { +if (isRunningOnTravisAndIsNotPRBuild) { play { track = "alpha" userFraction = 1 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4eb68b66ce..bcacf26b50 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,26 +17,24 @@ - - - - + - + + - + android:finishOnTaskLaunch="true" + android:launchMode="singleInstance" + android:theme="@android:style/Theme.Dialog" /> @@ -45,11 +43,11 @@ - - + android:label="@string/app_name"> @@ -69,9 +67,9 @@ + android:label="@string/app_name" /> @@ -79,48 +77,41 @@ android:name=".AboutActivity" android:label="@string/title_activity_about" android:parentActivityName=".contributions.MainActivity" /> - - - - - - - + + - - - + android:parentActivityName=".contributions.MainActivity" /> - - + + @@ -156,7 +148,6 @@ android:name="android.content.SyncAdapter" android:resource="@xml/modifications_sync_adapter" /> - - - - - - + \ No newline at end of file diff --git a/app/src/main/java/fr/free/nrw/commons/upload/EditUploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/EditUploadActivity.java new file mode 100644 index 0000000000..1daa555265 --- /dev/null +++ b/app/src/main/java/fr/free/nrw/commons/upload/EditUploadActivity.java @@ -0,0 +1,68 @@ +package fr.free.nrw.commons.upload; + +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.widget.GridView; + +import com.theartofdev.edmodo.cropper.CropImage; +import com.theartofdev.edmodo.cropper.CropImageView; + +import java.util.ArrayList; +import java.util.HashMap; + +import fr.free.nrw.commons.R; +import fr.free.nrw.commons.filepicker.UploadableFile; + +import static fr.free.nrw.commons.upload.UploadService.EXTRA_FILES; + +public class EditUploadActivity extends AppCompatActivity { + + GridView gridView; + CropImageView cropImageView; + HashMap hashMap=new HashMap(); + private static int currentSelectedPosition; + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_edit_upload); + + gridView = (GridView) findViewById(R.id.gridView); + cropImageView = findViewById(R.id.cropImageView); + ArrayList files = getIntent().getParcelableArrayListExtra(EXTRA_FILES); + ImageAdapter adapter = new ImageAdapter(this, files); + gridView.setOnItemClickListener((parent, v, position, id) -> { + currentSelectedPosition=position; + CropImage.activity(Uri.fromFile(files.get(position).getFile())) + .start(this); + }); + + gridView.setAdapter(adapter); + + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE) { + CropImage.ActivityResult result = CropImage.getActivityResult(data); + if (resultCode == RESULT_OK) { + Uri resultUri = result.getUri(); + hashMap.put(currentSelectedPosition,resultUri); + } else if (resultCode == CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE) { + Exception error = result.getError(); + } + } + } + + @Override + public void onBackPressed() { + super.onBackPressed(); + Intent intent = new Intent(this, UploadActivity.class); + intent.putExtra("hashMap", hashMap); + startActivity(intent); + } +} diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ImageAdapter.java b/app/src/main/java/fr/free/nrw/commons/upload/ImageAdapter.java new file mode 100644 index 0000000000..9d4b3ca141 --- /dev/null +++ b/app/src/main/java/fr/free/nrw/commons/upload/ImageAdapter.java @@ -0,0 +1,62 @@ +package fr.free.nrw.commons.upload; + +import android.app.Activity; +import android.content.Context; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.GridView; +import android.widget.ImageView; + +import com.theartofdev.edmodo.cropper.CropImage; + +import java.util.ArrayList; + +import fr.free.nrw.commons.filepicker.UploadableFile; + +public class ImageAdapter extends BaseAdapter { + private Context mContext; + private ArrayList files; + + // Constructor + public ImageAdapter(Context c, ArrayList files) { + this.files = files; + mContext = c; + } + + public int getCount() { + return files.size(); + } + + public Object getItem(int position) { + return null; + } + + public long getItemId(int position) { + return 0; + } + + // create a new ImageView for each item referenced by the Adapter + public View getView(int position, View convertView, ViewGroup parent) { + ImageView imageView; + + if (convertView == null) { + imageView = new ImageView(mContext); + imageView.setLayoutParams(new GridView.LayoutParams(250, 250)); + imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); + imageView.setPadding(8, 8, 8, 8); + } else { + imageView = (ImageView) convertView; + } + imageView.setImageURI(files.get(position).getMediaUri()); + + return imageView; + } + + public void handleClickListener(int position){ + CropImage.activity(files.get(position).getMediaUri()) + .start((Activity) mContext); + } + + // Keep all Images in array +} diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java index 58a30f6b1e..ef95d88bea 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java @@ -39,7 +39,9 @@ import com.theartofdev.edmodo.cropper.CropImage; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; import javax.inject.Inject; @@ -102,7 +104,7 @@ public class UploadActivity extends BaseActivity implements UploadView, SimilarI @BindView(R.id.bottom_card_expand_button) ImageView bottomCardExpandButton; @BindView(R.id.bottom_card_title) TextView bottomCardTitle; @BindView(R.id.bottom_card_subtitle) TextView bottomCardSubtitle; - @BindView(R.id.editImage) Button next; + @BindView(R.id.bottom_card_next) Button next; @BindView(R.id.bottom_card_previous) Button previous; @BindView(R.id.bottom_card_add_desc) Button bottomCardAddDescription; @BindView(R.id.categories_subtitle) TextView categoriesSubtitle; @@ -131,7 +133,7 @@ public class UploadActivity extends BaseActivity implements UploadView, SimilarI @BindView(R.id.submit) Button submit; @BindView(R.id.license_previous) Button licensePrevious; @BindView(R.id.rv_descriptions) RecyclerView rvDescriptions; - @BindView(R.id.bottom_card_next) ImageView editImages; + @BindView(R.id.editImage) ImageView editImages; private DescriptionsAdapter descriptionsAdapter; private RVRendererAdapter categoriesAdapter; @@ -151,6 +153,16 @@ protected void onCreate(Bundle savedInstanceState) { ArrayList files= getIntent().getParcelableArrayListExtra(EXTRA_FILES); + Intent intent = getIntent(); + HashMap hashMap = (HashMap) intent.getSerializableExtra("hashMap"); + if (hashMap!=null){ + for (Map.Entry entry : hashMap.entrySet()) { + int key = entry.getKey(); + Uri value = entry.getValue(); + presenter.updateImageUri(key,value); + } + } + configureLayout(); configureTopCard(); configureBottomCard(); @@ -370,7 +382,7 @@ public void setRightCardState(boolean state) { @Override public void setBackground(Uri mediaUri) { - if (!updatedImage) + //if (!updatedImage) background.setImageURI(mediaUri); } @@ -439,6 +451,13 @@ public void openCropImage(Uri uri) { .start(this); } + @Override + public void openEditImageActivity(String extraFiles, ArrayList uri) { + Intent intent=new Intent(this,EditUploadActivity.class); + intent.putParcelableArrayListExtra(extraFiles, new ArrayList<>(uri)); + startActivity(intent); + } + @Override public void launchMapActivity(String decCoords) { Utils.handleGeoCoordinates(this, decCoords); @@ -466,8 +485,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (resultCode == RESULT_OK) { resultUri = result.getUri(); updatedImage=true; - background.setImageURI(resultUri); - background.setScaleType(ImageView.ScaleType.CENTER_CROP); + presenter.updateImageUri(0,resultUri); } else if (resultCode == CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE) { Exception error = result.getError(); } @@ -538,7 +556,6 @@ private void configureLayout() { private void configureEditImage(ArrayList uri) { editImages.setOnClickListener(v -> {presenter.editImages(uri); }); - //openCropImage(Uri.fromFile(uri.get(0).getFile())); } private void configureTopCard() { diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java index f90708c654..3b4a768f4f 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java @@ -240,6 +240,9 @@ void jumpTo(UploadItem item) { UploadItem getCurrentItem() { return isShowingItem() ? items.get(currentStepIndex) : DUMMY; } + void modifyCurrentItem(int position,UploadItem uploadItem){ + items.set(position,uploadItem); + } boolean isShowingItem() { return currentStepIndex < items.size(); @@ -327,7 +330,7 @@ public List getItems() { @SuppressWarnings("WeakerAccess") static class UploadItem { - private final Uri mediaUri; + private Uri mediaUri; private final String mimeType; private final String source; private final GPSExtractor gpsCoords; @@ -408,6 +411,9 @@ public Title getTitle() { public Uri getMediaUri() { return mediaUri; } + public void setImageUri(Uri uri){ + mediaUri=uri; + } public int getImageQuality() { return this.imageQuality.getValue(); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java index 1454625fa7..0b4e5508d7 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Context; +import android.content.Intent; import android.net.Uri; import android.os.Parcelable; @@ -28,6 +29,7 @@ import timber.log.Timber; import static fr.free.nrw.commons.upload.UploadModel.UploadItem; +import static fr.free.nrw.commons.upload.UploadService.EXTRA_FILES; import static fr.free.nrw.commons.utils.ImageUtils.EMPTY_TITLE; import static fr.free.nrw.commons.utils.ImageUtils.FILE_NAME_EXISTS; import static fr.free.nrw.commons.utils.ImageUtils.IMAGE_KEEP; @@ -138,7 +140,21 @@ private void handleImage(Title title, List descriptions, Integer im } void editImages(ArrayList uri){ - view.openCropImage(Uri.fromFile(uri.get(0).getFile())); + if (uri!=null){ + if (uri.size()==1) + view.openCropImage(Uri.fromFile(uri.get(0).getFile())); + else if (uri.size()>1){ + view.openEditImageActivity(EXTRA_FILES, new ArrayList<>(uri)); + + } + } + } + + void updateImageUri(int position, Uri uri){ + UploadItem uploadItem=uploadModel.getCurrentItem(); + uploadItem.setImageUri(uri); + uploadModel.modifyCurrentItem(position,uploadItem); + view.setBackground(uploadModel.getCurrentItem().getMediaUri()); } /** diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java index 7cf2ae4d91..7c9c217271 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java @@ -4,8 +4,10 @@ import android.support.annotation.IntDef; import java.lang.annotation.Retention; +import java.util.ArrayList; import java.util.List; +import fr.free.nrw.commons.filepicker.UploadableFile; import fr.free.nrw.commons.utils.ImageUtils; import static java.lang.annotation.RetentionPolicy.SOURCE; @@ -87,4 +89,7 @@ public interface UploadView { void hideProgressDialog(); void openCropImage(Uri uri); + + void openEditImageActivity(String extraFiles, ArrayList es); + } diff --git a/app/src/main/res/layout/activity_edit_upload.xml b/app/src/main/res/layout/activity_edit_upload.xml new file mode 100644 index 0000000000..6e4a1fdd64 --- /dev/null +++ b/app/src/main/res/layout/activity_edit_upload.xml @@ -0,0 +1,31 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_upload_bottom_card.xml b/app/src/main/res/layout/activity_upload_bottom_card.xml index 487ed91e84..1b567c20fc 100644 --- a/app/src/main/res/layout/activity_upload_bottom_card.xml +++ b/app/src/main/res/layout/activity_upload_bottom_card.xml @@ -104,11 +104,6 @@ android:layout_marginBottom="8dp" android:visibility="visible" app:srcCompat="@drawable/ic_map_white_24dp" /> - @@ -154,6 +149,20 @@ app:layout_constraintTop_toBottomOf="@id/bottom_card_title" tools:text="1st image" /> + + - - Explore - Explore - Appearance - General - Feedback - Location - Commons - • - Settings - Upload to Commons - Username - Password - Log in to your Commons Beta account - Log in - Forgot Password? - Sign up - Logging in - Please wait… - Login success! - Login failed! - File not found. Please try another file. - Authentication failed, please login again - Upload started! - %1$s uploaded! - Tap to view your upload - Starting %1$s upload - %1$s uploading - Finishing uploading %1$s - Uploading %1$s failed - Tap to view - - %1$d file uploading - %1$d files uploading - - My Recent Uploads - Queued - Failed - %1$d%% complete - Uploading - From Gallery - Take photo - Nearby - My uploads - Share - View in Browser - Title (Required) - Please provide a title for this file - Description - Unable to login - network failure - Unable to login - please check your username and password - Too many unsuccessful attempts. Please try again in a few minutes. - Sorry, this user has been blocked on Commons - You must provide your two factor authentication code. - Login failed - Upload - Name this set - Please provide a name for this set - Modifications - Upload - Search categories - Save - Refresh - List - GPS is disabled in your device. Would you like to enable it? - Enable GPS - No uploads yet - - - @string/contributions_subtitle_zero - (%1$d) - (%1$d) - - - Starting %1$d upload - Starting %1$d uploads - - - %1$d upload - %1$d uploads - - No categories matching %1$s found - Add categories to make your images more discoverable on Wikimedia Commons.\nStart typing to add categories. - Categories - Settings - Sign Up - Featured Images - Category - About - The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. - Wikimedia Commons - Create a new <a href=\"https://github.com/commons-app/apps-android-commons/issues\">GitHub issue</a> for bug reports and suggestions. - - - About - Send Feedback (via Email) - No email client installed - Recently used categories - Waiting for first sync… - You have not yet uploaded any photos. - Retry - Cancel - - This image will be licensed under %1$s - These images will be licensed under %1$s - - By submitting this picture, I declare that this is my own work, that it does not contain copyrighted material or selfies, and otherwise adheres to <a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\">Wikimedia Commons policies</a>. - Download - Default License - Use previous title/description - Automatically get current location - Retrieves current location if image is not geotagged, and geotags image with it. Warning: This will reveal your current location. - Night mode - Use dark theme - Attribution-ShareAlike 4.0 - Attribution 4.0 - Attribution-ShareAlike 3.0 - Attribution 3.0 - CC0 - CC BY-SA 3.0 - CC BY-SA 3.0 (Austria) - CC BY-SA 3.0 (Germany) - CC BY-SA 3.0 (Estonia) - CC BY-SA 3.0 (Spain) - CC BY-SA 3.0 (Croatia) - CC BY-SA 3.0 (Luxembourg) - CC BY-SA 3.0 (Netherlands) - CC BY-SA 3.0 (Norway) - CC BY-SA 3.0 (Poland) - CC BY-SA 3.0 (Romania) - CC BY 3.0 - CC BY-SA 4.0 - CC BY 4.0 - CC Zero - Wikimedia Commons hosts most of the images that are used in Wikipedia. - Your images help educate people around the world! - Please upload pictures that are taken or created entirely by yourself: - Natural objects (flowers, animals, mountains) - Useful objects (bicycles, train stations) - Famous people (your mayor, Olympic athletes you met) - Please do NOT upload: - Selfies or pictures of your friends - Pictures you downloaded from the Internet - Screenshots of proprietary apps - Example upload: - Title: Sydney Opera House - Description: Sydney Opera House as viewed from across the bay - Categories: Sydney Opera House from the west, Sydney Opera House remote views - Contribute your images. Help Wikipedia articles come to life! - Images on Wikipedia come from Wikimedia Commons. - Your images help educate people around the world. - Avoid copyrighted materials you found from the Internet as well as images of posters, book covers, etc. - You think you got it? - Yes! - - Categories - Loading… - None selected - No description - Unknown license - Refresh - Requesting Storage Permission - Required permission: Read external storage. App cannot access your gallery without this. - Required permission: Write external storage. App cannot access your camera without this. - Optional permission: Get current location for category suggestions - OK - Nearby Places - No nearby places found - Warning - This file already exists on Commons. Are you sure you want to proceed? - Yes - No - Title - Description - Author - Uploaded date - License - Coordinates - None provided - Become a Beta Tester - Opt-in to our beta channel on Google Play and get early access to new features and bug fixes - https://play.google.com/apps/testing/fr.free.nrw.commons - mapbox://styles/mapbox/traffic-day-v2 - mapbox://styles/mapbox/traffic-night-v2 - pk.eyJ1IjoibWFza2FyYXZpdmVrIiwiYSI6ImNqMmxvdzFjMTAwMHYzM283ZWM3eW5tcDAifQ.ib5SZ9EVjwJe6GSKve0bcg - 2FA Code - My Recent Upload Limit - Maximum Limit - Zero is not valid - Invalid Input - Unable to display more than 500 - Enter a valid number - Upload limit cannot be 0 - Set Recent Upload Limit - Two factor authentication is currently not supported. - Do you really want to logout? - Commons Logo - Commons Website - Commons Facebook Page - Commons Github Source Code - Background Image - Media Image Failed - No Image Found - No subcategories found - No parent categories found - Upload Image - Mount Zao - Llamas - Rainbow Bridge - Tulip - No Selfies - Proprietary Image - Welcome Wikipedia - Welcome Copyright - Sydney Opera House - Cancel - Open - Close - Home - Upload - Nearby - About - Settings - Feedback - Logout - Tutorial - Notifications - Featured - Nearby places cannot be displayed without location permissions - no description found - Commons file page - Wikidata item - Wikipedia article - Error while caching pictures - A unique descriptive title for the file, which will serve as a filename. You may use plain language with spaces. Do not include the file extension - Please describe the media as much as possible: Where was it taken? What does it show? What is the context? Please describe the objects or persons. Reveal information that can not be easily guessed, for instance the time of day if it is a landscape. If the media shows something unusual, please explain what makes it unusual. - This picture is too dark, are you sure you want to upload it? Wikimedia Commons is only for pictures with encyclopedic value. - This picture is blurry, are you sure you want to upload it? Wikimedia Commons is only for pictures with encyclopedic value. + Explore + Explore + Appearance + General + Feedback + Location + Commons + • + Settings + Upload to Commons + Username + Password + Log in to your Commons Beta account + Log in + Forgot Password? + Sign up + Logging in + Please wait… + Login success! + Login failed! + File not found. Please try another file. + Authentication failed, please login again + Upload started! + %1$s uploaded! + Tap to view your upload + Starting %1$s upload + %1$s uploading + Finishing uploading %1$s + Uploading %1$s failed + Tap to view + + %1$d file uploading + %1$d files uploading + + My Recent Uploads + Queued + Failed + %1$d%% complete + Uploading + From Gallery + Take photo + Nearby + My uploads + Share + View in Browser + Title (Required) + Please provide a title for this file + Description + Unable to login - network failure + Unable to login - please check your username and password + Too many unsuccessful attempts. Please try again in a few minutes. + Sorry, this user has been blocked on Commons + You must provide your two factor authentication code. + Login failed + Upload + Name this set + Please provide a name for this set + Modifications + Upload + Search categories + Save + Refresh + List + GPS is disabled in your device. Would you like to enable it? + Enable GPS + No uploads yet + + + @string/contributions_subtitle_zero + (%1$d) + (%1$d) + + + Starting %1$d upload + Starting %1$d uploads + + + %1$d upload + %1$d uploads + + No categories matching %1$s found + Add categories to make your images more discoverable on Wikimedia Commons.\nStart typing to add categories. + Categories + Settings + Sign Up + Featured Images + Category + About + The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. + Wikimedia Commons + Create a new <a href=\"https://github.com/commons-app/apps-android-commons/issues\">GitHub issue</a> for bug reports and suggestions. + + + About + Send Feedback (via Email) + No email client installed + Recently used categories + Waiting for first sync… + You have not yet uploaded any photos. + Retry + Cancel + + This image will be licensed under %1$s + These images will be licensed under %1$s + + By submitting this picture, I declare that this is my own work, that it does not contain copyrighted material or selfies, and otherwise adheres to <a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\">Wikimedia Commons policies</a>. + Download + Default License + Use previous title/description + Automatically get current location + Retrieves current location if image is not geotagged, and geotags image with it. Warning: This will reveal your current location. + Night mode + Use dark theme + Attribution-ShareAlike 4.0 + Attribution 4.0 + Attribution-ShareAlike 3.0 + Attribution 3.0 + CC0 + CC BY-SA 3.0 + CC BY-SA 3.0 (Austria) + CC BY-SA 3.0 (Germany) + CC BY-SA 3.0 (Estonia) + CC BY-SA 3.0 (Spain) + CC BY-SA 3.0 (Croatia) + CC BY-SA 3.0 (Luxembourg) + CC BY-SA 3.0 (Netherlands) + CC BY-SA 3.0 (Norway) + CC BY-SA 3.0 (Poland) + CC BY-SA 3.0 (Romania) + CC BY 3.0 + CC BY-SA 4.0 + CC BY 4.0 + CC Zero + Wikimedia Commons hosts most of the images that are used in Wikipedia. + Your images help educate people around the world! + Please upload pictures that are taken or created entirely by yourself: + Natural objects (flowers, animals, mountains) + Useful objects (bicycles, train stations) + Famous people (your mayor, Olympic athletes you met) + Please do NOT upload: + Selfies or pictures of your friends + Pictures you downloaded from the Internet + Screenshots of proprietary apps + Example upload: + Title: Sydney Opera House + Description: Sydney Opera House as viewed from across the bay + Categories: Sydney Opera House from the west, Sydney Opera House remote views + Contribute your images. Help Wikipedia articles come to life! + Images on Wikipedia come from Wikimedia Commons. + Your images help educate people around the world. + Avoid copyrighted materials you found from the Internet as well as images of posters, book covers, etc. + You think you got it? + Yes! + + Categories + Loading… + None selected + No description + Unknown license + Refresh + Requesting Storage Permission + Required permission: Read external storage. App cannot access your gallery without this. + Required permission: Write external storage. App cannot access your camera without this. + Optional permission: Get current location for category suggestions + OK + Nearby Places + No nearby places found + Warning + This file already exists on Commons. Are you sure you want to proceed? + Yes + No + Title + Description + Author + Uploaded date + License + Coordinates + None provided + Become a Beta Tester + Opt-in to our beta channel on Google Play and get early access to new features and bug fixes + https://play.google.com/apps/testing/fr.free.nrw.commons + mapbox://styles/mapbox/traffic-day-v2 + mapbox://styles/mapbox/traffic-night-v2 + pk.eyJ1IjoibWFza2FyYXZpdmVrIiwiYSI6ImNqMmxvdzFjMTAwMHYzM283ZWM3eW5tcDAifQ.ib5SZ9EVjwJe6GSKve0bcg + 2FA Code + My Recent Upload Limit + Maximum Limit + Zero is not valid + Invalid Input + Unable to display more than 500 + Enter a valid number + Upload limit cannot be 0 + Set Recent Upload Limit + Two factor authentication is currently not supported. + Do you really want to logout? + Commons Logo + Commons Website + Commons Facebook Page + Commons Github Source Code + Background Image + Media Image Failed + No Image Found + No subcategories found + No parent categories found + Upload Image + Mount Zao + Llamas + Rainbow Bridge + Tulip + No Selfies + Proprietary Image + Welcome Wikipedia + Welcome Copyright + Sydney Opera House + Cancel + Open + Close + Home + Upload + Nearby + About + Settings + Feedback + Logout + Tutorial + Notifications + Featured + Nearby places cannot be displayed without location permissions + no description found + Commons file page + Wikidata item + Wikipedia article + Error while caching pictures + A unique descriptive title for the file, which will serve as a filename. You may use plain language with spaces. Do not include the file extension + Please describe the media as much as possible: Where was it taken? What does it show? What is the context? Please describe the objects or persons. Reveal information that can not be easily guessed, for instance the time of day if it is a landscape. If the media shows something unusual, please explain what makes it unusual. + This picture is too dark, are you sure you want to upload it? Wikimedia Commons is only for pictures with encyclopedic value. + This picture is blurry, are you sure you want to upload it? Wikimedia Commons is only for pictures with encyclopedic value. - Potential problems with this image : - Image is too dark. - Image is blurry. - Image is already on Commons. - This picture was taken at a different location. - Please only upload pictures that you have taken by yourself. Don\'t upload pictures that you have found on other people\'s Facebook accounts. - Do you still want to upload this picture? + Potential problems with this image : + Image is too dark. + Image is blurry. + Image is already on Commons. + This picture was taken at a different location. + Please only upload pictures that you have taken by yourself. Don\'t upload pictures that you have found on other people\'s Facebook accounts. + Do you still want to upload this picture? - Give permission - Use external storage - Save pictures taken with the in-app camera on your device - Log in to your account - Send log file - Send log file to developers via email to help debug problems with the app. Note: logs may potentially contain identifying information - No web browser found to open URL - Error! URL not found - Nominate for Deletion - This image has been nominated for deletion. - - View in Browser - Skip - Log in - Do you really want to skip login? - You would have to log in to upload pictures in the future. - Please log in to use this feature - Copy the wikitext to the clipboard - The wikitext was copied to the clipboard + Give permission + Use external storage + Save pictures taken with the in-app camera on your device + Log in to your account + Send log file + Send log file to developers via email to help debug problems with the app. Note: logs may potentially contain identifying information + No web browser found to open URL + Error! URL not found + Nominate for Deletion + This image has been nominated for deletion. + + View in Browser + Skip + Log in + Do you really want to skip login? + You would have to log in to upload pictures in the future. + Please log in to use this feature + Copy the wikitext to the clipboard + The wikitext was copied to the clipboard - Location has not changed. - Location not available. - Permission required to display a list of nearby places - GET DIRECTIONS - READ ARTICLE + Location has not changed. + Location not available. + Permission required to display a list of nearby places + GET DIRECTIONS + READ ARTICLE - Welcome to Wikimedia Commons, %1$s! We\'re glad you\'re here. - %1$s left a message on your talk page - Thank you for making an edit - %1$s mentioned you on %2$s. - Toggle view - DIRECTIONS - WIKIDATA - WIKIPEDIA - COMMONS - - - Skip Tutorial - Internet unavailable - Internet available - Error fetching notifications - No notifications found - - Languages - Select the language that you would like to submit translations for - Proceed - Cancel - Retry + Welcome to Wikimedia Commons, %1$s! We\'re glad you\'re here. + %1$s left a message on your talk page + Thank you for making an edit + %1$s mentioned you on %2$s. + Toggle view + DIRECTIONS + WIKIDATA + WIKIPEDIA + COMMONS + + + Skip Tutorial + Internet unavailable + Internet available + Error fetching notifications + No notifications found + + Languages + Select the language that you would like to submit translations for + Proceed + Cancel + Retry - Got it! - These are the places near you that need pictures to illustrate their Wikipedia articles - Tapping this button brings up a list of these places - You can upload a picture for any place from your gallery or camera + Got it! + These are the places near you that need pictures to illustrate their Wikipedia articles + Tapping this button brings up a list of these places + You can upload a picture for any place from your gallery or camera - No images found! - Error occurred while loading images. - Uploaded by: %1$s + No images found! + Error occurred while loading images. + Uploaded by: %1$s - You are blocked from editing Commons - Pic of the Day - Pic of the Day - Search - Search Commons - No Images matching %1$s found - Search - Recent searches: - Recently searched queries - Error occurred while loading categories. - Error occurred while loading subcategories. - MEDIA - CATEGORIES + You are blocked from editing Commons + Pic of the Day + Pic of the Day + Search + Search Commons + No Images matching %1$s found + Search + Recent searches: + Recently searched queries + Error occurred while loading categories. + Error occurred while loading subcategories. + MEDIA + CATEGORIES - Image successfully added to %1$s on Wikidata! - Failed to update corresponding Wikidata entity! - Set as wallpaper - Wallpaper set successfully! - Quiz - Is this picture OK to upload? - Question - Result - If you carry on uploading images that require deletion, your account will likely be banned. Are you sure you want to end the quiz? - More than %1$s of the images you uploaded have been deleted. If you carry on uploading images that require deletion, your account will likely be banned.\n\nWould you like to view the tutorial again and then take a quiz to help you learn what type of images you should or shouldn\'t upload? - Selfies do not have much encyclopedic value. Please do not upload a picture of yourself unless you already have a Wikipedia article about you. - Pictures of monuments and outside scenery are OK to upload in most countries. Please note that temporary art installations outside are often copyrighted and not OK to upload. - Screenshots of websites are considered derivatives works and subject to any copyright on the website itself. These can be used after permission from the author. Without such permission, any art you create based on their work is legally considered an unlicensed copy owned by the original author. - One of the goals of Commons is to gather quality images. Therefore, blurry images shouldn\'t be uploaded. Always try to take nice pictures with good lighting. - Pictures showing technology or culture are very welcome on Commons. - WARNING: More than %1$s of the images you uploaded have been deleted. If you carry on uploading images that require deletion, your account will likely be banned. - You got %1$s of the answers correct. Congratulations! - Select one of the two options to answer the question - Login session expired, please log in again. - Share your quiz with your friends! - Continue - Correct Answer - Wrong Answer - Is this screenshot OK to upload? - Share App - Coordinates were not specified during image selection - Error fetching nearby places. - + Add description + Image successfully added to %1$s on Wikidata! + Failed to update corresponding Wikidata entity! + Set as wallpaper + Wallpaper set successfully! + Quiz + Is this picture OK to upload? + Question + Result + If you carry on uploading images that require deletion, your account will likely be banned. Are you sure you want to end the quiz? + More than %1$s of the images you uploaded have been deleted. If you carry on uploading images that require deletion, your account will likely be banned.\n\nWould you like to view the tutorial again and then take a quiz to help you learn what type of images you should or shouldn\'t upload? + Selfies do not have much encyclopedic value. Please do not upload a picture of yourself unless you already have a Wikipedia article about you. + Pictures of monuments and outside scenery are OK to upload in most countries. Please note that temporary art installations outside are often copyrighted and not OK to upload. + Screenshots of websites are considered derivatives works and subject to any copyright on the website itself. These can be used after permission from the author. Without such permission, any art you create based on their work is legally considered an unlicensed copy owned by the original author. + One of the goals of Commons is to gather quality images. Therefore, blurry images shouldn\'t be uploaded. Always try to take nice pictures with good lighting. + Pictures showing technology or culture are very welcome on Commons. + WARNING: More than %1$s of the images you uploaded have been deleted. If you carry on uploading images that require deletion, your account will likely be banned. + You got %1$s of the answers correct. Congratulations! + Select one of the two options to answer the question + Login session expired, please log in again. + Share your quiz with your friends! + Continue + Correct Answer + Wrong Answer + Is this screenshot OK to upload? + Share App + Coordinates were not specified during image selection + Error fetching nearby places. + + Add description - No recent searches - Are you sure you want to clear your search history? - Search history deleted - Nominate For Deletion + No recent searches + Are you sure you want to clear your search history? + Search history deleted + Nominate For Deletion - Achievements - STATISTICS - Thanks Received - Featured Images - Images via \"Nearby Places\" - LEVEL - Images Uploaded - Images Not Reverted - Images Used - Share your achievements with your friends! - Your level increases as you meet these requirements. Items in the "statistics" section do not count towards your level. - minimum required: - The number of images you have uploaded to Commons, via any upload software - The percentage of images you have uploaded to Commons that were not deleted - The number of images you have uploaded to Commons that were used in Wikimedia articles + Achievements + STATISTICS + Thanks Received + Featured Images + Images via \"Nearby Places\" + LEVEL + Images Uploaded + Images Not Reverted + Images Used + Share your achievements with your friends! + Your level increases as you meet these requirements. Items in the "statistics" section do not count towards your level. + minimum required: + The number of images you have uploaded to Commons, via any upload software + The percentage of images you have uploaded to Commons that were not deleted + The number of images you have uploaded to Commons that were used in Wikimedia articles - Error occurred! - Commons Notification + Error occurred! + Commons Notification - Use custom author name - Use a custom author name instead of your username while uploading photos - Custom author name - The custom author name to use instead of your username in uploads - Contributions - Nearby - Notifications - Notifications (archived) - Display nearby notification - Tap here to see the nearest place that needs pictures - No nearby places found close to you - List + Use custom author name + Use a custom author name instead of your username while uploading photos + Custom author name + The custom author name to use instead of your username in uploads + Contributions + Nearby + Notifications + Notifications (archived) + Display nearby notification + Tap here to see the nearest place that needs pictures + No nearby places found close to you + List - Storage Permission - We need your permission to access the external storage of your device in order to upload images. - You won\'t see the nearest place that needs pictures anymore. However, you can re-enable this notification in Settings if you wish. + Storage Permission + We need your permission to access the external storage of your device in order to upload images. + You won\'t see the nearest place that needs pictures anymore. However, you can re-enable this notification in Settings if you wish. - Step %1$d of %2$d - Image %1$d in set - Next - Previous - Submit - A file with the file name %1$s exists. Are you sure you want to proceed? - No compatible map application could be found on your device. Please install a map application to use this feature. - + Step %1$d of %2$d + Image %1$d in set + Next + Previous + Submit + A file with the file name %1$s exists. Are you sure you want to proceed? + No compatible map application could be found on your device. Please install a map application to use this feature. + %1$d Upload %1$d Uploads - Bookmarks - Bookmarks - Pictures - Locations - Add/Remove to bookmarks - Bookmarks - You haven\'t added any bookmarks - Bookmarks - Log collection started. Please RESTART the app, perform action that you wish to log, and then tap \'Send log file\' again + Bookmarks + Bookmarks + Pictures + Locations + Add/Remove to bookmarks + Bookmarks + You haven\'t added any bookmarks + Bookmarks + Log collection started. Please RESTART the app, perform action that you wish to log, and then tap \'Send log file\' again - I uploaded it by mistake - I did not know it would be publicly visible - I realized it is bad for my privacy - I changed my mind, I don\'t want it to be publicly visible anymore - Sorry this picture is not interesting for an encyclopedia - Uploaded by myself on - ,used in - articles + I uploaded it by mistake + I did not know it would be publicly visible + I realized it is bad for my privacy + I changed my mind, I don\'t want it to be publicly visible anymore + Sorry this picture is not interesting for an encyclopedia + Uploaded by myself on + ,used in + articles - Welcome to Commons!\n + Welcome to Commons!\n Upload your first media by touching the camera or gallery icon above. - Worldwide - America - Europe - Middle East - Africa - Asia - Pacific + Worldwide + America + Europe + Middle East + Africa + Asia + Pacific - No Categories Selected - Images without categories are rarely usable. Are you sure you want to submit without selecting categories? + No Categories Selected + Images without categories are rarely usable. Are you sure you want to submit without selecting categories? - Yes, Submit - No, Go Back + Yes, Submit + No, Go Back - (For all images in set) - Search this area - Permission Request - Would you like us to use your current location to display the nearest place that needs pictures? - Unable to display nearest place that needs pictures without location permissions - Never ask this again - Display location permission - Ask for location permission when needed for nearby notification card view feature. - Something went wrong, We could not fetch your achievements - Ends on: - Display campaigns - Tap here to see the ongoing campaigns - You won\'t see the campaigns anymore. However, you can re-enable this notification in Settings if you wish. + (For all images in set) + Search this area + Permission Request + Would you like us to use your current location to display the nearest place that needs pictures? + Unable to display nearest place that needs pictures without location permissions + Never ask this again + Display location permission + Ask for location permission when needed for nearby notification card view feature. + Something went wrong, We could not fetch your achievements + Ends on: + Display campaigns + Tap here to see the ongoing campaigns + You won\'t see the campaigns anymore. However, you can re-enable this notification in Settings if you wish. - This function requires network connection, please check your connection settings. - Upload failed due to issues with edit token. Please try logging out and in again. + This function requires network connection, please check your connection settings. + Upload failed due to issues with edit token. Please try logging out and in again. Error occurred while processing the image. Please try again! - - Receiving shared content. Processing the image might take some time depending on the size of the image and your device - Receiving shared content. Processing the images might take some time depending on the size of the images and your device - + + Receiving shared content. Processing the image might take some time depending on the size of the image and your device + Receiving shared content. Processing the images might take some time depending on the size of the images and your device + - No images used - No images reverted - No images uploaded + No images used + No images reverted + No images uploaded - You have no unread Notification - You have no archived notification - Share logs using - View archived - View unread + You have no unread Notification + You have no archived notification + Share logs using + View archived + View unread - Error occurred while picking images - Choose Images to upload + Error occurred while picking images + Choose Images to upload - Please wait… + Please wait… + EditUploadActivity From 4841723b58a3452a8108b451a793ebfe1ad07636 Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Mon, 11 Mar 2019 17:57:31 +0530 Subject: [PATCH 05/18] multiple uploads --- app/src/main/AndroidManifest.xml | 4 +++- .../commons/filepicker/UploadableFile.java | 13 +++++++++++- .../commons/upload/EditUploadActivity.java | 21 ++++++++++++++++++- .../nrw/commons/upload/UploadActivity.java | 4 ++++ 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8fcd243fb7..d25615fb91 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -34,7 +35,8 @@ android:excludeFromRecents="true" android:finishOnTaskLaunch="true" /> - + diff --git a/app/src/main/java/fr/free/nrw/commons/filepicker/UploadableFile.java b/app/src/main/java/fr/free/nrw/commons/filepicker/UploadableFile.java index d4e01c836d..875646876a 100644 --- a/app/src/main/java/fr/free/nrw/commons/filepicker/UploadableFile.java +++ b/app/src/main/java/fr/free/nrw/commons/filepicker/UploadableFile.java @@ -13,6 +13,8 @@ import java.io.File; import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; import java.util.Date; import javax.annotation.Nullable; @@ -33,7 +35,7 @@ public UploadableFile[] newArray(int size) { }; private final Uri contentUri; - private final File file; + private File file; public UploadableFile(Uri contentUri, File file) { this.contentUri = contentUri; @@ -62,6 +64,15 @@ public Uri getMediaUri() { return Uri.parse(getFilePath()); } + public void updateFilePath(Uri uri){ + String path = uri.toString(); + try { + file=new File(new URI(path)); + } catch (URISyntaxException e) { + e.printStackTrace(); + } + } + public String getMimeType(Context context) { return FileUtils.getMimeType(context, getMediaUri()); } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/EditUploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/EditUploadActivity.java index 1daa555265..839fd6d058 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/EditUploadActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/EditUploadActivity.java @@ -1,5 +1,6 @@ package fr.free.nrw.commons.upload; +import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; @@ -11,18 +12,23 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import fr.free.nrw.commons.R; import fr.free.nrw.commons.filepicker.UploadableFile; +import static fr.free.nrw.commons.contributions.ContributionController.ACTION_INTERNAL_UPLOADS; import static fr.free.nrw.commons.upload.UploadService.EXTRA_FILES; +import static fr.free.nrw.commons.upload.UploadService.EXTRA_SOURCE; public class EditUploadActivity extends AppCompatActivity { GridView gridView; CropImageView cropImageView; HashMap hashMap=new HashMap(); + ArrayList files=new ArrayList<>(); private static int currentSelectedPosition; + String source; @Override @@ -32,7 +38,8 @@ protected void onCreate(Bundle savedInstanceState) { gridView = (GridView) findViewById(R.id.gridView); cropImageView = findViewById(R.id.cropImageView); - ArrayList files = getIntent().getParcelableArrayListExtra(EXTRA_FILES); + files = getIntent().getParcelableArrayListExtra(EXTRA_FILES); + source=getIntent().getStringExtra(EXTRA_SOURCE); ImageAdapter adapter = new ImageAdapter(this, files); gridView.setOnItemClickListener((parent, v, position, id) -> { currentSelectedPosition=position; @@ -43,6 +50,14 @@ protected void onCreate(Bundle savedInstanceState) { gridView.setAdapter(adapter); } + private Intent handleImagesPicked(List imagesFiles, + String source) { + Intent shareIntent = new Intent(this, UploadActivity.class); + shareIntent.setAction(ACTION_INTERNAL_UPLOADS); + //shareIntent.putExtra(EXTRA_SOURCE, source); + shareIntent.putParcelableArrayListExtra(EXTRA_FILES, new ArrayList<>(imagesFiles)); + return shareIntent; + } @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { @@ -52,6 +67,10 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (resultCode == RESULT_OK) { Uri resultUri = result.getUri(); hashMap.put(currentSelectedPosition,resultUri); + files.get(currentSelectedPosition).updateFilePath(resultUri); + Intent intent = handleImagesPicked( files, source); + startActivity(intent); + finish(); } else if (resultCode == CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE) { Exception error = result.getError(); } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java index 47e369166b..058b7a543a 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java @@ -76,6 +76,7 @@ import static fr.free.nrw.commons.contributions.Contribution.SOURCE_EXTERNAL; import static fr.free.nrw.commons.contributions.ContributionController.ACTION_INTERNAL_UPLOADS; import static fr.free.nrw.commons.upload.UploadService.EXTRA_FILES; +import static fr.free.nrw.commons.upload.UploadService.EXTRA_SOURCE; import static fr.free.nrw.commons.wikidata.WikidataConstants.PLACE_OBJECT; public class UploadActivity extends BaseActivity implements UploadView, SimilarImageInterface { @@ -140,6 +141,7 @@ public class UploadActivity extends BaseActivity implements UploadView, SimilarI private CompositeDisposable compositeDisposable; private ProgressDialog progressDialog; private static boolean updatedImage =false; + private String source; @SuppressLint("CheckResult") @@ -152,6 +154,7 @@ protected void onCreate(Bundle savedInstanceState) { compositeDisposable = new CompositeDisposable(); ArrayList files= getIntent().getParcelableArrayListExtra(EXTRA_FILES); + source=getIntent().getStringExtra(EXTRA_SOURCE); Intent intent = getIntent(); HashMap hashMap = (HashMap) intent.getSerializableExtra("hashMap"); @@ -455,6 +458,7 @@ public void openCropImage(Uri uri) { public void openEditImageActivity(String extraFiles, ArrayList uri) { Intent intent=new Intent(this,EditUploadActivity.class); intent.putParcelableArrayListExtra(extraFiles, new ArrayList<>(uri)); + intent.putExtra(EXTRA_SOURCE,source); startActivity(intent); } From dabe0ce0bce73242755e2a86dfd8c3a7c7d00920 Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Mon, 11 Mar 2019 19:57:21 +0530 Subject: [PATCH 06/18] removed edit activity --- app/src/main/AndroidManifest.xml | 2 - .../commons/upload/EditUploadActivity.java | 87 ------------------- .../nrw/commons/upload/UploadActivity.java | 10 +-- .../nrw/commons/upload/UploadPresenter.java | 14 ++- .../free/nrw/commons/upload/UploadView.java | 3 +- .../main/res/layout/activity_edit_upload.xml | 31 ------- 6 files changed, 17 insertions(+), 130 deletions(-) delete mode 100644 app/src/main/java/fr/free/nrw/commons/upload/EditUploadActivity.java delete mode 100644 app/src/main/res/layout/activity_edit_upload.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d25615fb91..8de3913234 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -35,8 +35,6 @@ android:excludeFromRecents="true" android:finishOnTaskLaunch="true" /> - diff --git a/app/src/main/java/fr/free/nrw/commons/upload/EditUploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/EditUploadActivity.java deleted file mode 100644 index 839fd6d058..0000000000 --- a/app/src/main/java/fr/free/nrw/commons/upload/EditUploadActivity.java +++ /dev/null @@ -1,87 +0,0 @@ -package fr.free.nrw.commons.upload; - -import android.content.Context; -import android.content.Intent; -import android.net.Uri; -import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.widget.GridView; - -import com.theartofdev.edmodo.cropper.CropImage; -import com.theartofdev.edmodo.cropper.CropImageView; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import fr.free.nrw.commons.R; -import fr.free.nrw.commons.filepicker.UploadableFile; - -import static fr.free.nrw.commons.contributions.ContributionController.ACTION_INTERNAL_UPLOADS; -import static fr.free.nrw.commons.upload.UploadService.EXTRA_FILES; -import static fr.free.nrw.commons.upload.UploadService.EXTRA_SOURCE; - -public class EditUploadActivity extends AppCompatActivity { - - GridView gridView; - CropImageView cropImageView; - HashMap hashMap=new HashMap(); - ArrayList files=new ArrayList<>(); - private static int currentSelectedPosition; - String source; - - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_edit_upload); - - gridView = (GridView) findViewById(R.id.gridView); - cropImageView = findViewById(R.id.cropImageView); - files = getIntent().getParcelableArrayListExtra(EXTRA_FILES); - source=getIntent().getStringExtra(EXTRA_SOURCE); - ImageAdapter adapter = new ImageAdapter(this, files); - gridView.setOnItemClickListener((parent, v, position, id) -> { - currentSelectedPosition=position; - CropImage.activity(Uri.fromFile(files.get(position).getFile())) - .start(this); - }); - - gridView.setAdapter(adapter); - - } - private Intent handleImagesPicked(List imagesFiles, - String source) { - Intent shareIntent = new Intent(this, UploadActivity.class); - shareIntent.setAction(ACTION_INTERNAL_UPLOADS); - //shareIntent.putExtra(EXTRA_SOURCE, source); - shareIntent.putParcelableArrayListExtra(EXTRA_FILES, new ArrayList<>(imagesFiles)); - return shareIntent; - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (requestCode == CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE) { - CropImage.ActivityResult result = CropImage.getActivityResult(data); - if (resultCode == RESULT_OK) { - Uri resultUri = result.getUri(); - hashMap.put(currentSelectedPosition,resultUri); - files.get(currentSelectedPosition).updateFilePath(resultUri); - Intent intent = handleImagesPicked( files, source); - startActivity(intent); - finish(); - } else if (resultCode == CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE) { - Exception error = result.getError(); - } - } - } - - @Override - public void onBackPressed() { - super.onBackPressed(); - Intent intent = new Intent(this, UploadActivity.class); - intent.putExtra("hashMap", hashMap); - startActivity(intent); - } -} diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java index 058b7a543a..bc3f689f93 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java @@ -142,6 +142,7 @@ public class UploadActivity extends BaseActivity implements UploadView, SimilarI private ProgressDialog progressDialog; private static boolean updatedImage =false; private String source; + private static int currentItem=0; @SuppressLint("CheckResult") @@ -455,11 +456,8 @@ public void openCropImage(Uri uri) { } @Override - public void openEditImageActivity(String extraFiles, ArrayList uri) { - Intent intent=new Intent(this,EditUploadActivity.class); - intent.putParcelableArrayListExtra(extraFiles, new ArrayList<>(uri)); - intent.putExtra(EXTRA_SOURCE,source); - startActivity(intent); + public void setCurrentItem(int position) { + currentItem=position; } @Override @@ -489,7 +487,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (resultCode == RESULT_OK) { resultUri = result.getUri(); updatedImage=true; - presenter.updateImageUri(0,resultUri); + presenter.updateImageUri(currentItem,resultUri); } else if (resultCode == CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE) { Exception error = result.getError(); } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java index 0b4e5508d7..fbec44c234 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java @@ -5,6 +5,8 @@ import android.content.Intent; import android.net.Uri; import android.os.Parcelable; +import android.util.Log; +import android.widget.Toast; import java.lang.reflect.Proxy; import java.util.ArrayList; @@ -143,9 +145,15 @@ void editImages(ArrayList uri){ if (uri!=null){ if (uri.size()==1) view.openCropImage(Uri.fromFile(uri.get(0).getFile())); - else if (uri.size()>1){ - view.openEditImageActivity(EXTRA_FILES, new ArrayList<>(uri)); - + else if (uri.size()>1){int c=0; + for (UploadableFile u:uri){ + if (u.getMediaUri().equals(uploadModel.getCurrentItem().getMediaUri())){ + view.openCropImage(Uri.fromFile(uri.get(c).getFile())); + view.setCurrentItem(c); + } + + c++; + } } } } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java index bcee5ae62f..aa6a8549e4 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java @@ -88,6 +88,7 @@ public interface UploadView { void openCropImage(Uri uri); - void openEditImageActivity(String extraFiles, ArrayList es); + void setCurrentItem(int position); + } diff --git a/app/src/main/res/layout/activity_edit_upload.xml b/app/src/main/res/layout/activity_edit_upload.xml deleted file mode 100644 index 6e4a1fdd64..0000000000 --- a/app/src/main/res/layout/activity_edit_upload.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - \ No newline at end of file From a7b6ed1ce9248971a9b3b9942c1475413d926028 Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Tue, 12 Mar 2019 22:15:26 +0530 Subject: [PATCH 07/18] codacy issues --- .../main/java/fr/free/nrw/commons/upload/UploadActivity.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java index bc3f689f93..2c5f4972af 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java @@ -140,8 +140,6 @@ public class UploadActivity extends BaseActivity implements UploadView, SimilarI private RVRendererAdapter categoriesAdapter; private CompositeDisposable compositeDisposable; private ProgressDialog progressDialog; - private static boolean updatedImage =false; - private String source; private static int currentItem=0; @@ -489,7 +487,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { updatedImage=true; presenter.updateImageUri(currentItem,resultUri); } else if (resultCode == CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE) { - Exception error = result.getError(); + Toast.makeText(this, "Sorry there was an error in editing the image", Toast.LENGTH_SHORT).show(); } } } From b9316e1e2b4c9ff98f6034ea4f981437b112bdab Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Wed, 13 Mar 2019 18:45:38 +0530 Subject: [PATCH 08/18] fixed travis-ci issue --- .../main/java/fr/free/nrw/commons/upload/UploadActivity.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java index d1ee69041c..3ee3ab5064 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java @@ -157,7 +157,6 @@ protected void onCreate(Bundle savedInstanceState) { compositeDisposable = new CompositeDisposable(); ArrayList files= getIntent().getParcelableArrayListExtra(EXTRA_FILES); - source=getIntent().getStringExtra(EXTRA_SOURCE); Intent intent = getIntent(); HashMap hashMap = (HashMap) intent.getSerializableExtra("hashMap"); @@ -488,7 +487,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { CropImage.ActivityResult result = CropImage.getActivityResult(data); if (resultCode == RESULT_OK) { resultUri = result.getUri(); - updatedImage=true; presenter.updateImageUri(currentItem,resultUri); } else if (resultCode == CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE) { Toast.makeText(this, "Sorry there was an error in editing the image", Toast.LENGTH_SHORT).show(); From 263272471c99a73459863996c3ea78d7eaa008bc Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Thu, 14 Mar 2019 15:43:58 +0530 Subject: [PATCH 09/18] fixed issues in case of multiple images --- .../nrw/commons/upload/UploadActivity.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java index 3ee3ab5064..d07f010055 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java @@ -145,6 +145,9 @@ public class UploadActivity extends BaseActivity implements UploadView, SimilarI private CompositeDisposable compositeDisposable; private ProgressDialog progressDialog; private static int currentItem=0; + private static String source; + private static Place place; + private ArrayList files; @SuppressLint("CheckResult") @@ -156,7 +159,9 @@ protected void onCreate(Bundle savedInstanceState) { ButterKnife.bind(this); compositeDisposable = new CompositeDisposable(); - ArrayList files= getIntent().getParcelableArrayListExtra(EXTRA_FILES); + files = getIntent().getParcelableArrayListExtra(EXTRA_FILES); + source=getIntent().getStringExtra(EXTRA_SOURCE); + place=getIntent().getParcelableExtra(PLACE_OBJECT); Intent intent = getIntent(); HashMap hashMap = (HashMap) intent.getSerializableExtra("hashMap"); @@ -488,6 +493,17 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (resultCode == RESULT_OK) { resultUri = result.getUri(); presenter.updateImageUri(currentItem,resultUri); + files.get(currentItem).updateFilePath(resultUri); + Intent shareIntent = new Intent(this, UploadActivity.class); + shareIntent.setAction(ACTION_INTERNAL_UPLOADS); + shareIntent.putExtra(EXTRA_SOURCE, source); + shareIntent.putParcelableArrayListExtra(EXTRA_FILES, new ArrayList<>(files)); + Place place = directKvStore.getJson(PLACE_OBJECT, Place.class); + if (place != null) { + shareIntent.putExtra(PLACE_OBJECT, place); + } + startActivity(shareIntent); + finish(); } else if (resultCode == CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE) { Toast.makeText(this, "Sorry there was an error in editing the image", Toast.LENGTH_SHORT).show(); } From bef74c6e3e121e85cb713cd04c6402acf953a03d Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Thu, 14 Mar 2019 22:13:39 +0530 Subject: [PATCH 10/18] finished code for multiple images --- .../free/nrw/commons/upload/UploadActivity.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java index d07f010055..e7ba20677f 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java @@ -145,8 +145,7 @@ public class UploadActivity extends BaseActivity implements UploadView, SimilarI private CompositeDisposable compositeDisposable; private ProgressDialog progressDialog; private static int currentItem=0; - private static String source; - private static Place place; + private String source; private ArrayList files; @@ -161,17 +160,6 @@ protected void onCreate(Bundle savedInstanceState) { files = getIntent().getParcelableArrayListExtra(EXTRA_FILES); source=getIntent().getStringExtra(EXTRA_SOURCE); - place=getIntent().getParcelableExtra(PLACE_OBJECT); - - Intent intent = getIntent(); - HashMap hashMap = (HashMap) intent.getSerializableExtra("hashMap"); - if (hashMap!=null){ - for (Map.Entry entry : hashMap.entrySet()) { - int key = entry.getKey(); - Uri value = entry.getValue(); - presenter.updateImageUri(key,value); - } - } configureLayout(); configureTopCard(); @@ -492,7 +480,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { CropImage.ActivityResult result = CropImage.getActivityResult(data); if (resultCode == RESULT_OK) { resultUri = result.getUri(); - presenter.updateImageUri(currentItem,resultUri); + //presenter.updateImageUri(currentItem,resultUri); files.get(currentItem).updateFilePath(resultUri); Intent shareIntent = new Intent(this, UploadActivity.class); shareIntent.setAction(ACTION_INTERNAL_UPLOADS); From 90d618b3f2fb265615b92b1973975a075b82f84a Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Tue, 19 Mar 2019 21:33:31 +0530 Subject: [PATCH 11/18] resolved merge conflicts --- app/src/main/res/values/strings.xml | 43 ++--------------------------- 1 file changed, 3 insertions(+), 40 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e33dd728df..583bcd94b1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,6 @@ + + <!–zero is not used in english. Category mentioned here for easy reference in future–> @string/contributions_subtitle_zero (%1$d) (%1$d) @@ -239,6 +240,7 @@ This picture is too dark, are you sure you want to upload it? Wikimedia Commons is only for pictures with encyclopedic value. This picture is blurry, are you sure you want to upload it? Wikimedia Commons is only for pictures with encyclopedic value. ======= +--> Explore Explore Appearance @@ -478,7 +480,6 @@ Please describe the media as much as possible: Where was it taken? What does it show? What is the context? Please describe the objects or persons. Reveal information that can not be easily guessed, for instance the time of day if it is a landscape. If the media shows something unusual, please explain what makes it unusual. This picture is too dark, are you sure you want to upload it? Wikimedia Commons is only for pictures with encyclopedic value. This picture is blurry, are you sure you want to upload it? Wikimedia Commons is only for pictures with encyclopedic value. ->>>>>>> f4807a5e4bd0f78bc01bdb792b34eb700c326cce Potential problems with this image : Image is too dark. @@ -537,37 +538,15 @@ Cancel Retry -<<<<<<< HEAD - Got it! - These are the places near you that need pictures to illustrate their Wikipedia articles - Tapping this button brings up a list of these places - You can upload a picture for any place from your gallery or camera -======= Got it! These are the places near you that need pictures to illustrate their Wikipedia articles.\n\nClicking on \'SEARCH THIS AREA\' locks the map and launches a nearby search around that location. Tapping this button brings up a list of these places You can upload a picture for any place from your gallery or camera ->>>>>>> f4807a5e4bd0f78bc01bdb792b34eb700c326cce No images found! Error occurred while loading images. Uploaded by: %1$s -<<<<<<< HEAD - You are blocked from editing Commons - Pic of the Day - Pic of the Day - Search - Search Commons - No Images matching %1$s found - Search - Recent searches: - Recently searched queries - Error occurred while loading categories. - Error occurred while loading subcategories. - MEDIA - CATEGORIES -======= You are blocked from editing Commons Pic of the Day Pic of the Day @@ -583,7 +562,6 @@ CATEGORIES FEATURED UPLOADED VIA MOBILE ->>>>>>> 40568eccf8b8dd4406d9cca11f9990cd41653120 Image successfully added to %1$s on Wikidata! Failed to update corresponding Wikidata entity! @@ -614,19 +592,12 @@ Error fetching nearby places. + Add description -<<<<<<< HEAD - No recent searches - Are you sure you want to clear your search history? - Search history deleted - Nominate For Deletion -======= No recent searches Are you sure you want to clear your search history? Do you want to delete this search? Search history deleted Nominate For Deletion DELETE ->>>>>>> 40568eccf8b8dd4406d9cca11f9990cd41653120 Achievements STATISTICS @@ -736,19 +707,11 @@ Upload your first media by tapping on the add button. No images reverted No images uploaded -<<<<<<< HEAD - You have no unread Notification - You have no archived notification - Share logs using - View archived - View unread -======= You have no unread notifications You have no archived notifications Share logs using View archived View unread ->>>>>>> 40568eccf8b8dd4406d9cca11f9990cd41653120 Error occurred while picking images Choose Images to upload From 514da51351d43912c50d81bc3ee1c6814c6ba5c9 Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Wed, 20 Mar 2019 12:45:30 +0530 Subject: [PATCH 12/18] copying EXIF data --- app/build.gradle | 15 +++-- .../commons/contributions/MainActivity.java | 2 +- .../free/nrw/commons/upload/EXIFReader.java | 2 +- .../nrw/commons/upload/UploadActivity.java | 24 +++++++- .../nrw/commons/upload/UploadPresenter.java | 55 +++++++++++++++++++ 5 files changed, 88 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dcf6335413..39eccec114 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -82,21 +82,24 @@ dependencies { testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$LEAK_CANARY_VERSION" // Support libraries - implementation "androidx.legacy:legacy-support-v4:1.0.0" - implementation "androidx.appcompat:appcompat:1.0.2" - implementation "com.google.android.material:material:1.1.0-alpha04" - implementation "androidx.browser:browser:1.0.0" - implementation "androidx.cardview:cardview:1.0.0" + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'com.google.android.material:material:1.1.0-alpha04' + implementation 'androidx.browser:browser:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation "androidx.exifinterface:exifinterface:1.0.0" + implementation 'androidx.exifinterface:exifinterface:1.0.0' //swipe_layout implementation 'com.daimajia.swipelayout:library:1.2.0@aar' implementation 'com.nineoldandroids:library:2.4.0' + //image crop implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.+' + //metadata extractor implementation 'com.drewnoakes:metadata-extractor:2.11.0' + implementation files('libs/commons-imaging-1.0-R1401825.jar') } android { diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java index 9f9c6e6492..7a70eb7975 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java @@ -463,7 +463,7 @@ private void updateContributionFragmentTabContent(boolean isContributionsListFra @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - Timber.d(data.toString()); + //Timber.d(data.toString()); super.onActivityResult(requestCode, resultCode, data); controller.handleActivityResult(this, requestCode, resultCode, data); } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/EXIFReader.java b/app/src/main/java/fr/free/nrw/commons/upload/EXIFReader.java index 70e5689563..50b31b6fb3 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/EXIFReader.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/EXIFReader.java @@ -32,7 +32,7 @@ public EXIFReader() { * And the checks for the presence of EXIF Directories in metadata object * */ - public Single processMetadata(String path) { + public static Single processMetadata(String path) { Metadata readMetadata = null; try { readMetadata = ImageMetadataReader.readMetadata(new File(path)); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java index fa794f7f57..971b0db14c 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java @@ -38,7 +38,16 @@ import com.jakewharton.rxbinding2.widget.RxTextView; import com.pedrogomez.renderers.RVRendererAdapter; import com.theartofdev.edmodo.cropper.CropImage; +import org.apache.commons.imaging.ImageReadException; +import org.apache.commons.imaging.ImageWriteException; +import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.common.IImageMetadata; +import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata; +import org.apache.commons.imaging.formats.jpeg.exif.ExifRewriter; +import org.apache.commons.imaging.formats.tiff.TiffImageMetadata; + +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -144,6 +153,7 @@ public class UploadActivity extends BaseActivity implements UploadView, SimilarI private static int currentItem=0; private String source; private ArrayList files; + private EXIFReader EXIFReader ; @SuppressLint("CheckResult") @@ -471,8 +481,18 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { CropImage.ActivityResult result = CropImage.getActivityResult(data); if (resultCode == RESULT_OK) { resultUri = result.getUri(); - //presenter.updateImageUri(currentItem,resultUri); - files.get(currentItem).updateFilePath(resultUri); + try { + resultUri=presenter.restoreEXIFData(files.get(currentItem).getMediaUri(),resultUri); + } catch (IOException e) { + e.printStackTrace(); + } catch (ImageReadException e) { + e.printStackTrace(); + } catch (ImageWriteException e) { + e.printStackTrace(); + } + + //files.get(currentItem).updateFilePath(resultUri); + fr.free.nrw.commons.upload.EXIFReader.processMetadata(resultUri.getPath()); Intent shareIntent = new Intent(this, UploadActivity.class); shareIntent.setAction(ACTION_INTERNAL_UPLOADS); shareIntent.putExtra(EXTRA_SOURCE, source); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java index 8b5a02e94d..2a2d6022ee 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java @@ -3,12 +3,31 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.net.Uri; import android.os.Parcelable; +import android.provider.MediaStore; import android.util.Log; import android.widget.Toast; +import com.facebook.common.internal.ByteStreams; + +import org.apache.commons.imaging.ImageReadException; +import org.apache.commons.imaging.ImageWriteException; +import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.common.IImageMetadata; +import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata; +import org.apache.commons.imaging.formats.jpeg.exif.ExifRewriter; +import org.apache.commons.imaging.formats.tiff.TiffImageMetadata; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.lang.reflect.Proxy; +import java.net.URI; import java.util.ArrayList; import java.util.List; @@ -162,6 +181,42 @@ void updateImageUri(int position, Uri uri){ view.setBackground(uploadModel.getCurrentItem().getMediaUri()); } + Uri restoreEXIFData(Uri originalImageUri, Uri postCropUri) throws IOException, ImageReadException, ImageWriteException { + InputStream iStream = context.getContentResolver().openInputStream(postCropUri); + byte[] inputData = ByteStreams.toByteArray(iStream); + return writeExifMetadata(readExifMetadata(originalImageUri), inputData); + } + + private TiffImageMetadata readExifMetadata(Uri uri) throws ImageReadException, IOException { + IImageMetadata imageMetadata = Imaging.getMetadata(new File(uri.getPath())); + if (imageMetadata == null) { + return null; + } + JpegImageMetadata jpegMetadata = (JpegImageMetadata)imageMetadata; + TiffImageMetadata exif = jpegMetadata.getExif(); + if (exif == null) { + return null; + } + return exif; + } + private Uri writeExifMetadata(TiffImageMetadata metadata, byte[] jpegData) + throws ImageReadException, ImageWriteException, IOException { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + new ExifRewriter().updateExifMetadataLossless(jpegData, out, metadata.getOutputSet()); + out.close(); + Bitmap bmp = BitmapFactory.decodeByteArray(out.toByteArray(), 0, out.toByteArray().length); + EXIFReader.processMetadata(getImageUri(bmp, Bitmap.CompressFormat.JPEG,100).getPath()); + return getImageUri(bmp, Bitmap.CompressFormat.JPEG,100); + } + public Uri getImageUri(Bitmap src, Bitmap.CompressFormat format, int quality) { + ByteArrayOutputStream os = new ByteArrayOutputStream(); + src.compress(format, quality, os); + + String path = MediaStore.Images.Media.insertImage(context.getContentResolver(), src, "title", null); + return Uri.parse(path); + } + + /** * Called by the next button in {@link UploadActivity} */ From f4fd9cdf1e54f5062a7b8fa2c0c528bdefdf384d Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Sat, 23 Mar 2019 14:11:20 +0530 Subject: [PATCH 13/18] restored exif to image uri --- .../nrw/commons/upload/UploadActivity.java | 3 +-- .../nrw/commons/upload/UploadPresenter.java | 25 ++++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java index 070f912ca9..98b54ea7cb 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java @@ -485,8 +485,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { e.printStackTrace(); } - //files.get(currentItem).updateFilePath(resultUri); - fr.free.nrw.commons.upload.EXIFReader.processMetadata(resultUri.getPath()); + files.get(currentItem).updateFilePath(resultUri); Intent shareIntent = new Intent(this, UploadActivity.class); shareIntent.setAction(ACTION_INTERNAL_UPLOADS); shareIntent.putExtra(EXTRA_SOURCE, source); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java index 57fc60b5af..59588b3bef 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java @@ -6,6 +6,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.net.Uri; +import android.os.Environment; import android.os.Parcelable; import android.provider.MediaStore; import android.util.Log; @@ -26,6 +27,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.lang.reflect.Proxy; import java.net.URI; import java.util.ArrayList; @@ -186,6 +188,10 @@ void updateImageUri(int position, Uri uri){ Uri restoreEXIFData(Uri originalImageUri, Uri postCropUri) throws IOException, ImageReadException, ImageWriteException { InputStream iStream = context.getContentResolver().openInputStream(postCropUri); byte[] inputData = ByteStreams.toByteArray(iStream); + TiffImageMetadata metadata = readExifMetadata(originalImageUri); + if (metadata == null) + return originalImageUri; + else return writeExifMetadata(readExifMetadata(originalImageUri), inputData); } @@ -205,20 +211,15 @@ private Uri writeExifMetadata(TiffImageMetadata metadata, byte[] jpegData) throws ImageReadException, ImageWriteException, IOException { ByteArrayOutputStream out = new ByteArrayOutputStream(); new ExifRewriter().updateExifMetadataLossless(jpegData, out, metadata.getOutputSet()); - out.close(); - Bitmap bmp = BitmapFactory.decodeByteArray(out.toByteArray(), 0, out.toByteArray().length); - EXIFReader.processMetadata(getImageUri(bmp, Bitmap.CompressFormat.JPEG,100).getPath()); - return getImageUri(bmp, Bitmap.CompressFormat.JPEG,100); - } - public Uri getImageUri(Bitmap src, Bitmap.CompressFormat format, int quality) { - ByteArrayOutputStream os = new ByteArrayOutputStream(); - src.compress(format, quality, os); - - String path = MediaStore.Images.Media.insertImage(context.getContentResolver(), src, "title", null); - return Uri.parse(path); + File myFileName = new File(Environment.getExternalStorageDirectory().getAbsolutePath()+"/My Directory"); + String filePath = myFileName.toString(); + try(OutputStream outputStream = new FileOutputStream(new File(filePath))) { + out.writeTo(outputStream); + } + Uri uri = Uri.fromFile(new File(filePath)); + return uri; } - /** * Called by the next button in {@link UploadActivity} */ From 350e5c08e35eabd62d818f9a9982ba59fdcaa594 Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Sat, 23 Mar 2019 16:25:12 +0530 Subject: [PATCH 14/18] fixed codacy and travis-ci issues --- app/build.gradle | 1 + build.gradle | 1 + 2 files changed, 2 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 39eccec114..384a3e6e8f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -100,6 +100,7 @@ dependencies { //metadata extractor implementation 'com.drewnoakes:metadata-extractor:2.11.0' implementation files('libs/commons-imaging-1.0-R1401825.jar') + annotationProcessor 'com.android.tools.build.jetifier:jetifier-core:1.0.0-beta02' } android { diff --git a/build.gradle b/build.gradle index ad7e27f69c..1399048873 100644 --- a/build.gradle +++ b/build.gradle @@ -13,6 +13,7 @@ buildscript { classpath "com.github.triplet.gradle:play-publisher:2.0.0-rc1" classpath 'org.codehaus.groovy:groovy-all:2.4.15' + classpath 'com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta02' } } From ddb43dc89d8b4343f143a1d8cbf7117215e146c1 Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Sat, 23 Mar 2019 19:33:59 +0530 Subject: [PATCH 15/18] resolved codacy issues --- .../java/fr/free/nrw/commons/upload/UploadActivity.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java index 98b54ea7cb..a86a65696f 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java @@ -39,18 +39,11 @@ import com.theartofdev.edmodo.cropper.CropImage; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.ImageWriteException; -import org.apache.commons.imaging.Imaging; -import org.apache.commons.imaging.common.IImageMetadata; -import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata; -import org.apache.commons.imaging.formats.jpeg.exif.ExifRewriter; -import org.apache.commons.imaging.formats.tiff.TiffImageMetadata; import java.io.IOException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.inject.Inject; @@ -150,7 +143,6 @@ public class UploadActivity extends BaseActivity implements UploadView, SimilarI private static int currentItem=0; private String source; private ArrayList files; - private EXIFReader EXIFReader ; @SuppressLint("CheckResult") From 41c5b348a05142dd72b2ca8cde6aadc83fb77edd Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Sun, 24 Mar 2019 14:03:45 +0530 Subject: [PATCH 16/18] fixed travis-ci error --- app/build.gradle | 3 ++- .../main/java/fr/free/nrw/commons/upload/UploadPresenter.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 384a3e6e8f..5a2468a4da 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -99,7 +99,8 @@ dependencies { //metadata extractor implementation 'com.drewnoakes:metadata-extractor:2.11.0' - implementation files('libs/commons-imaging-1.0-R1401825.jar') + implementation fileTree(include:['commons-imaging-1.0-R1401825.jar'], dir: "/media/vanshika/25151b5f-bb91-4813-863c-b418727a0635/vanshika/apps-android-commons/app/libs") + //implementation files('libs/commons-imaging-1.0-R1401825.jar') annotationProcessor 'com.android.tools.build.jetifier:jetifier-core:1.0.0-beta02' } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java index 59588b3bef..580fab3454 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java @@ -190,7 +190,7 @@ Uri restoreEXIFData(Uri originalImageUri, Uri postCropUri) throws IOException, I byte[] inputData = ByteStreams.toByteArray(iStream); TiffImageMetadata metadata = readExifMetadata(originalImageUri); if (metadata == null) - return originalImageUri; + return postCropUri; else return writeExifMetadata(readExifMetadata(originalImageUri), inputData); } From 07982a41f8ce0ee49d4c0a77c488cadd74951a56 Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Sun, 24 Mar 2019 23:00:29 +0530 Subject: [PATCH 17/18] travis --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5a2468a4da..4aa54159e9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -99,8 +99,8 @@ dependencies { //metadata extractor implementation 'com.drewnoakes:metadata-extractor:2.11.0' - implementation fileTree(include:['commons-imaging-1.0-R1401825.jar'], dir: "/media/vanshika/25151b5f-bb91-4813-863c-b418727a0635/vanshika/apps-android-commons/app/libs") - //implementation files('libs/commons-imaging-1.0-R1401825.jar') + //implementation fileTree(include:['commons-imaging-1.0-R1401825.jar'], dir: "/media/vanshika/25151b5f-bb91-4813-863c-b418727a0635/vanshika/apps-android-commons/app/libs") + implementation files('libs/commons-imaging-1.0-R1401825.jar') annotationProcessor 'com.android.tools.build.jetifier:jetifier-core:1.0.0-beta02' } From ed84b2b9d58b80c9f7be1589db56b6294eb23453 Mon Sep 17 00:00:00 2001 From: vanshikaarora Date: Mon, 25 Mar 2019 18:14:01 +0530 Subject: [PATCH 18/18] exclude library from jetifier --- gradle.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6de2f84553..371612aef0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,5 @@ DAGGER_VERSION=2.21 systemProp.http.proxyPort=0 systemProp.http.proxyHost= android.useAndroidX=true -android.enableJetifier=false \ No newline at end of file +android.enableJetifier=true +android.jetifier.blacklist = commons-imaging-1.0-R1401825.jar \ No newline at end of file