Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish transparent activity on dialog cancels

Browse Source
This commit is contained in:
Dominik Schürmann 2015-05-11 20:37:47 +02:00
parent f328a9de5e
commit dbbad1c95c
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java
View File

@ -164,6 +164,8 @@ public class InstallIntoSystemDialogActivity extends FragmentActivity {
builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialogInterface, int i) { public void onClick(DialogInterface dialogInterface, int i) {
InstallIntoSystemDialogActivity.this.setResult(Activity.RESULT_CANCELED);
InstallIntoSystemDialogActivity.this.finish();
} }
}); });
builder.create().show(); builder.create().show();
@ -222,7 +224,13 @@ public class InstallIntoSystemDialogActivity extends FragmentActivity {
AlertDialog.Builder alertBuilder = new AlertDialog.Builder(theme); AlertDialog.Builder alertBuilder = new AlertDialog.Builder(theme);
alertBuilder.setTitle(R.string.root_access_denied_title); alertBuilder.setTitle(R.string.root_access_denied_title);
alertBuilder.setMessage(getString(R.string.root_access_denied_body)); 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(); alertBuilder.create().show();
} }
} }
@ -314,13 +322,25 @@ public class InstallIntoSystemDialogActivity extends FragmentActivity {
checkRootTask.execute(); 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(); builder.create().show();
} else { } else {
AlertDialog.Builder builder = new AlertDialog.Builder(theme); AlertDialog.Builder builder = new AlertDialog.Builder(theme);
builder.setTitle(R.string.system_permission_denied_title); builder.setTitle(R.string.system_permission_denied_title);
builder.setMessage(getString(R.string.system_permission_denied_body)); 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(); builder.create().show();
} }
} }