Repository: incubator-taverna-mobile Updated Branches: refs/heads/master ca8ada18e -> 1562389e1
Added alert dialog before signing out from app Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/6f3d9195 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/6f3d9195 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/6f3d9195 Branch: refs/heads/master Commit: 6f3d9195d37f690313c400b0906ebe3d82729f4f Parents: 7522bc6 Author: 300vikram <300vik...@gmail.com> Authored: Sat Feb 17 00:20:05 2018 +0530 Committer: 300vikram <300vik...@gmail.com> Committed: Sat Feb 17 00:20:05 2018 +0530 ---------------------------------------------------------------------- .../taverna/mobile/ui/DashboardActivity.java | 30 ++++++++++++++++---- app/src/main/res/values/strings.xml | 3 ++ 2 files changed, 27 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6f3d9195/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java index 57c8852..47473bc 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java @@ -30,6 +30,7 @@ import org.apache.taverna.mobile.ui.workflow.WorkflowFragment; import org.apache.taverna.mobile.utils.ActivityUtils; import android.app.Dialog; +import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.support.design.widget.NavigationView; @@ -232,12 +233,7 @@ public class DashboardActivity extends AppCompatActivity { case R.id.nav_logout: - mDrawerLayout.closeDrawers(); - dataManager.getPreferencesHelper().setLoggedInFlag(false); - - startActivity(new Intent(getApplicationContext(), - LoginActivity.class)); - finish(); + signOutConfirmation(); return true; } @@ -253,6 +249,28 @@ public class DashboardActivity extends AppCompatActivity { return true; } + private void signOutConfirmation() { + new AlertDialog.Builder(this) + .setTitle(R.string.sign_out) + .setMessage(R.string.sign_out_message) + .setPositiveButton(R.string.sign_out, new DialogInterface.OnClickListener() { + + public void onClick(DialogInterface dialog, int whichButton) { + signOut(); + } + }) + .setNegativeButton(android.R.string.no, null).show(); + } + + private void signOut() { + mDrawerLayout.closeDrawers(); + dataManager.getPreferencesHelper().setLoggedInFlag(false); + + startActivity(new Intent(getApplicationContext(), + LoginActivity.class)); + finish(); + } + @Override public boolean onOptionsItemSelected(MenuItem item) { http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6f3d9195/app/src/main/res/values/strings.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 39dd2dd..6d62393 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -183,6 +183,9 @@ limitations under the License. <string name="please_wait">Please Wait ...</string> <string name="headline_taverna_player_portal_login">Taverna Player Portal Login</string> <string name="button_text_login">Login</string> + <string name="sign_out">Sign Out</string> + <string name="sign_out_message">Do you really want to sign out?</string> + <string name="title_activity_settings">Settings</string>
