From dbbad1c95ccea99cf44ffadb887a3daa8b57feee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 11 May 2015 20:37:47 +0200 Subject: [PATCH] Finish transparent activity on dialog cancels --- .../InstallIntoSystemDialogActivity.java | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java b/F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java index bc0a567c6..dee1a24dc 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java @@ -164,6 +164,8 @@ public class InstallIntoSystemDialogActivity extends FragmentActivity { builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { + InstallIntoSystemDialogActivity.this.setResult(Activity.RESULT_CANCELED); + InstallIntoSystemDialogActivity.this.finish(); } }); builder.create().show(); @@ -222,7 +224,13 @@ public class InstallIntoSystemDialogActivity extends FragmentActivity { AlertDialog.Builder alertBuilder = new AlertDialog.Builder(theme); alertBuilder.setTitle(R.string.root_access_denied_title); alertBuilder.setMessage(getString(R.string.root_access_denied_body)); - alertBuilder.setNeutralButton(android.R.string.ok, null); + alertBuilder.setNeutralButton(android.R.string.ok, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + InstallIntoSystemDialogActivity.this.setResult(Activity.RESULT_CANCELED); + InstallIntoSystemDialogActivity.this.finish(); + } + }); alertBuilder.create().show(); } } @@ -314,13 +322,25 @@ public class InstallIntoSystemDialogActivity extends FragmentActivity { checkRootTask.execute(); } }); - builder.setNegativeButton(R.string.cancel, null); + builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + InstallIntoSystemDialogActivity.this.setResult(Activity.RESULT_CANCELED); + InstallIntoSystemDialogActivity.this.finish(); + } + }); builder.create().show(); } else { AlertDialog.Builder builder = new AlertDialog.Builder(theme); builder.setTitle(R.string.system_permission_denied_title); builder.setMessage(getString(R.string.system_permission_denied_body)); - builder.setPositiveButton(R.string.ok, null); + builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + InstallIntoSystemDialogActivity.this.setResult(Activity.RESULT_CANCELED); + InstallIntoSystemDialogActivity.this.finish(); + } + }); builder.create().show(); } }