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

Make sure IAB will always be unbound 

Refs #291
This commit is contained in:
M66B 2016-02-12 07:52:19 +01:00
parent 8a7061a1eb
commit 2ab2ff00ec
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,8 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
private AlertDialog dialogVpn = null;
private AlertDialog dialogAbout = null;
private IAB iab = null;
private static final int REQUEST_VPN = 1;
private static final int REQUEST_INVITE = 2;
private static final int REQUEST_LOGCAT = 3;
@ -254,9 +256,9 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
// Update IAB SKUs
try {
new IAB(new IAB.Delegate() {
iab = new IAB(new IAB.Delegate() {
@Override
public void onReady(IAB iab) {
public void onReady() {
try {
iab.updatePurchases();
@ -272,9 +274,11 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
} finally {
iab.unbind();
iab = null;
}
}
}, this).bind();
}, this);
iab.bind();
} catch (Throwable ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
}
@ -337,6 +341,11 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
dialogAbout = null;
}
if (iab != null) {
iab.unbind();
iab = null;
}
super.onDestroy();
}

2
app/src/main/java/eu/faircode/netguard/ActivityPro.java
View File

@ -124,7 +124,7 @@ public class ActivityPro extends AppCompatActivity {
try {
iab = new IAB(new IAB.Delegate() {
@Override
public void onReady(final IAB iab) {
public void onReady() {
Log.i(TAG, "IAB ready");
try {
iab.updatePurchases();

4
app/src/main/java/eu/faircode/netguard/IAB.java
View File

@ -48,7 +48,7 @@ public class IAB implements ServiceConnection {
private static final int IAB_VERSION = 3;
public interface Delegate {
void onReady(IAB iab);
void onReady();
}
public IAB(Delegate delegate, Context context) {
@ -75,7 +75,7 @@ public class IAB implements ServiceConnection {
public void onServiceConnected(ComponentName name, IBinder binder) {
Log.i(TAG, "Connected");
service = IInAppBillingService.Stub.asInterface(binder);
delegate.onReady(this);
delegate.onReady();
}
@Override