From 20bd488fa424b7e1e633c5b4fd06590ab14149e8 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Wed, 20 Mar 2013 04:49:40 +0530 Subject: [PATCH] Add 'UP' support to Multiple uploads --- .../commons/MultipleShareActivity.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java b/commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java index 929240555..01fd6db87 100644 --- a/commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java +++ b/commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java @@ -9,6 +9,7 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; import android.os.IBinder; +import android.support.v4.app.FragmentManager; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; @@ -29,7 +30,8 @@ import java.util.concurrent.ExecutionException; public class MultipleShareActivity extends AuthenticatedActivity implements MediaDetailPagerFragment.MediaDetailProvider, - AdapterView.OnItemClickListener { + AdapterView.OnItemClickListener, + FragmentManager.OnBackStackChangedListener { private CommonsApplication app; private ArrayList photosList = null; @@ -148,6 +150,11 @@ public class MultipleShareActivity StartMultipleUploadTask startUploads = new StartMultipleUploadTask(); Utils.executeAsyncTask(startUploads); return true; + case android.R.id.home: + if(mediaDetails.isVisible()) { + getSupportFragmentManager().popBackStack(); + } + return true; } return super.onOptionsItemSelected(item); } @@ -162,6 +169,8 @@ public class MultipleShareActivity if(savedInstanceState != null) { photosList = savedInstanceState.getParcelableArrayList("uploadsList"); } + + getSupportFragmentManager().addOnBackStackChangedListener(this); requestAuthToken(); } @@ -240,4 +249,12 @@ public class MultipleShareActivity finish(); } + public void onBackStackChanged() { + if(mediaDetails != null && mediaDetails.isVisible()) { + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + } else { + getSupportActionBar().setDisplayHomeAsUpEnabled(false); + } + } + } \ No newline at end of file