mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-29 05:43:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #834 from akaita/667_fix_categories

Browse source 
667 fix categories
This commit is contained in:
neslihanturan 2017-08-09 11:31:23 +03:00 • committed by GitHub
commit 401de30630
17 changed files with 380 additions and 714 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java
View file

@ -22,6 +22,7 @@ import android.widget.AdapterView;
import android.widget.Toast;
import java.util.ArrayList;
import java.util.List;
import butterknife.ButterKnife;
import fr.free.nrw.commons.CommonsApplication;
@ -160,7 +161,7 @@ public class MultipleShareActivity
}
@Override
public void onCategoriesSave(ArrayList<String> categories) {
public void onCategoriesSave(List<String> categories) {
if(categories.size() > 0) {
ContentProviderClient client = getContentResolver().acquireContentProviderClient(ModificationsContentProvider.AUTHORITY);
for(Contribution contribution: photosList) {

4
app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
View file

@ -154,7 +154,7 @@ public class ShareActivity
}
@Override
public void onCategoriesSave(ArrayList<String> categories) {
public void onCategoriesSave(List<String> categories) {
if(categories.size() > 0) {
ModifierSequence categoriesSequence = new ModifierSequence(contribution.getContentUri());
@ -525,7 +525,7 @@ public class ShareActivity
switch (item.getItemId()) {
case android.R.id.home:
if(categorizationFragment!=null && categorizationFragment.isVisible()) {
categorizationFragment.backButtonDialog();
categorizationFragment.showBackButtonDialog();
} else {
onBackPressed();
}