mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Dismiss dialogs on destroy

This commit is contained in:
M66B 2015-11-02 19:53:56 +01:00
parent 7df0ec50f2
commit bad20add01
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/eu/faircode/netguard/ActivityMain.java
View File

@ -76,6 +76,8 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
private RuleAdapter adapter = null;
private MenuItem menuSearch = null;
private IInAppBillingService IABService = null;
private AlertDialog dialogFirst = null;
private AlertDialog dialogAbout = null;
private static final int REQUEST_VPN = 1;
private static final int REQUEST_IAB = 2;
@ -202,13 +204,14 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
tvFirst.setMovementMethod(LinkMovementMethod.getInstance());
// Show dialog
AlertDialog dialog = new AlertDialog.Builder(this)
dialogFirst = new AlertDialog.Builder(this)
.setView(view)
.setCancelable(false)
.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
prefs.edit().putBoolean("initialized", true).apply();
if (running)
prefs.edit().putBoolean("initialized", true).apply();
}
})
.setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
@ -217,8 +220,14 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
System.exit(0);
}
})
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialogInterface) {
dialogFirst = null;
}
})
.create();
dialog.show();
dialogFirst.show();
}
}
@ -236,6 +245,11 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
if (IABService != null)
unbindService(IABConnection);
if (dialogFirst != null)
dialogFirst.dismiss();
if (dialogAbout != null)
dialogAbout.dismiss();
super.onDestroy();
}
@ -557,17 +571,19 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
LocalBroadcastManager.getInstance(this).registerReceiver(onIABsuccess, iff);
// Show dialog
AlertDialog dialog = new AlertDialog.Builder(this)
dialogAbout = new AlertDialog.Builder(this)
.setView(view)
.setCancelable(true)
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialogInterface) {
LocalBroadcastManager.getInstance(ActivityMain.this).unregisterReceiver(onIABsuccess);
if (running)
LocalBroadcastManager.getInstance(ActivityMain.this).unregisterReceiver(onIABsuccess);
dialogAbout = null;
}
})
.create();
dialog.show();
dialogAbout.show();
// Check if IAB purchased
new AsyncTask<Object, Object, Object>() {