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

Connect billing client for Play store installs only

This commit is contained in:
M66B 2018-08-25 13:55:49 +00:00
parent f9c9f2d2f5
commit 830a13f278
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@ -83,7 +83,7 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
private DrawerLayout drawerLayout;
private ListView drawerList;
private ActionBarDrawerToggle drawerToggle;
private BillingClient billingClient;
private BillingClient billingClient = null;
private boolean newIntent = false;
@ -314,8 +314,10 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
}
}.load(this, new Bundle());
billingClient = BillingClient.newBuilder(this).setListener(this).build();
billingClient.startConnection(billingClientStateListener);
if (Helper.isPlayStoreInstall(this)) {
billingClient = BillingClient.newBuilder(this).setListener(this).build();
billingClient.startConnection(billingClientStateListener);
}
checkIntent(getIntent());
}
@ -360,7 +362,7 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
getSupportFragmentManager().popBackStack("unified", 0);
}
if (billingClient.isReady())
if (billingClient != null && billingClient.isReady())
queryPurchases();
}
@ -379,7 +381,8 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
@Override
protected void onDestroy() {
billingClient.endConnection();
if (billingClient != null)
billingClient.endConnection();
super.onDestroy();
}