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

Use IAB with valid fingerprint only

This commit is contained in:
M66B 2015-10-31 09:11:23 +01:00
parent d27b38faf9
commit 8efa12847d
3 changed files with 129 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
// adb shell pm clear com.android.vending
private static final String SKU_DONATE = "donation"; // "android.test.purchased";
private static final String ACTION_DONATE = "eu.faircode.netguard.DONATE";
private static final String ACTION_IAB = "eu.faircode.netguard.IAB";
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -366,6 +366,8 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
}
private void menu_about() {
final boolean valid = Util.hasValidFingerprint(TAG, this);
// Create view
LayoutInflater inflater = LayoutInflater.from(this);
View view = inflater.inflate(R.layout.about, null);
@ -377,57 +379,42 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
tvVersion.setText(Util.getSelfVersionName(this));
// Handle logcat
view.setOnClickListener(new View.OnClickListener() {
private short tap = 0;
if (valid)
view.setOnClickListener(new View.OnClickListener() {
private short tap = 0;
@Override
public void onClick(View view) {
if (++tap == 7) {
tap = 0;
Util.sendLogcat(TAG, ActivityMain.this);
@Override
public void onClick(View view) {
if (++tap == 7) {
tap = 0;
Util.sendLogcat(TAG, ActivityMain.this);
}
}
}
});
});
// Handle donate
final Intent donate = new Intent(Intent.ACTION_VIEW);
donate.setData(Uri.parse("http://www.netguard.me/"));
btnDonate.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
try {
// Start IAB
Bundle bundle = billingService.getBuyIntent(3, getPackageName(), SKU_DONATE, "inapp", "");
Log.i(TAG, "Billing.getBuyIntent");
Util.logBundle(TAG, bundle);
int response = bundle.getInt("RESPONSE_CODE");
Log.i(TAG, "Billing response=" + getBillingResult(response));
if (response == 0) {
PendingIntent pi = bundle.getParcelable("BUY_INTENT");
startIntentSenderForResult(
pi.getIntentSender(),
REQUEST_DONATION,
new Intent(),
Integer.valueOf(0),
Integer.valueOf(0),
Integer.valueOf(0));
}
} catch (Throwable ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
Toast.makeText(ActivityMain.this, ex.toString(), Toast.LENGTH_LONG).show();
}
if (valid)
IABinitiate();
else
startActivity(donate);
}
});
// Handle donated
final BroadcastReceiver onDonated = new BroadcastReceiver() {
final BroadcastReceiver onIABsuccess = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
btnDonate.setVisibility(View.GONE);
tvThanks.setVisibility(View.VISIBLE);
}
};
IntentFilter iff = new IntentFilter(ACTION_DONATE);
LocalBroadcastManager.getInstance(this).registerReceiver(onDonated, iff);
IntentFilter iff = new IntentFilter(ACTION_IAB);
LocalBroadcastManager.getInstance(this).registerReceiver(onIABsuccess, iff);
// Show dialog
AlertDialog dialog = new AlertDialog.Builder(this)
@ -436,74 +423,28 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialogInterface) {
LocalBroadcastManager.getInstance(ActivityMain.this).unregisterReceiver(onDonated);
LocalBroadcastManager.getInstance(ActivityMain.this).unregisterReceiver(onIABsuccess);
}
})
.create();
dialog.show();
// Handle SKUs
if (billingService != null)
new AsyncTask<Object, Object, Object>() {
// Validate IAB
if (valid && billingService != null)
new AsyncTask<Object, Object, Boolean>() {
@Override
protected Object doInBackground(Object... objects) {
try {
// Get available SKUs
ArrayList<String> skuList = new ArrayList<String>();
skuList.add(SKU_DONATE);
Bundle query = new Bundle();
query.putStringArrayList("ITEM_ID_LIST", skuList);
Bundle details = billingService.getSkuDetails(3, getPackageName(), "inapp", query);
Log.i(TAG, "Billing.getSkuDetails");
Util.logBundle(TAG, details);
int details_response = details.getInt("RESPONSE_CODE");
Log.i(TAG, "Billing response=" + getBillingResult(details_response));
if (details_response != 0)
return null;
// Check available SKUs
boolean found = false;
for (String item : details.getStringArrayList("DETAILS_LIST")) {
JSONObject object = new JSONObject(item);
if (SKU_DONATE.equals(object.getString("productId"))) {
found = true;
break;
}
}
Log.i(TAG, SKU_DONATE + "=" + found);
if (!found)
return null;
// Get purchases
Bundle purchases = billingService.getPurchases(3, getPackageName(), "inapp", null);
Log.i(TAG, "Billing.getPurchases");
Util.logBundle(TAG, purchases);
int purchases_response = purchases.getInt("RESPONSE_CODE");
Log.i(TAG, "Billing response=" + getBillingResult(purchases_response));
return (purchases_response == 0 ? purchases : null);
} catch (Throwable ex) {
return ex;
}
protected Boolean doInBackground(Object... objects) {
return IABvalidate();
}
@Override
protected void onPostExecute(Object result) {
if (result instanceof Throwable) {
// Handle exception
Throwable ex = (Throwable) result;
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
Toast.makeText(ActivityMain.this, ex.toString(), Toast.LENGTH_LONG).show();
} else if (result != null) {
// Show donate/donated
Bundle bundle = (Bundle) result;
ArrayList<String> skus = bundle.getStringArrayList("INAPP_PURCHASE_ITEM_LIST");
btnDonate.setVisibility(skus.contains(SKU_DONATE) ? View.GONE : View.VISIBLE);
tvThanks.setVisibility(skus.contains(SKU_DONATE) ? View.VISIBLE : View.GONE);
}
protected void onPostExecute(Boolean ok) {
btnDonate.setVisibility(ok ? View.GONE : View.VISIBLE);
tvThanks.setVisibility(ok ? View.VISIBLE : View.GONE);
}
}.execute();
else
btnDonate.setVisibility(donate.resolveActivity(getPackageManager()) == null ? View.GONE : View.VISIBLE);
}
@Override
@ -524,11 +465,11 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
} else if (requestCode == REQUEST_DONATION) {
if (resultCode == RESULT_OK) {
// Handle donation
Intent intent = new Intent(ACTION_DONATE);
Intent intent = new Intent(ACTION_IAB);
LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
} else if (data != null) {
int response = data.getIntExtra("RESPONSE_CODE", -1);
Log.i(TAG, "Billing response=" + getBillingResult(response));
Log.i(TAG, "Billing response=" + getIABResult(response));
}
} else {
@ -537,7 +478,77 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
}
}
private static String getBillingResult(int responseCode) {
private boolean IABvalidate() {
try {
// Get available SKUs
ArrayList<String> skuList = new ArrayList<>();
skuList.add(SKU_DONATE);
Bundle query = new Bundle();
query.putStringArrayList("ITEM_ID_LIST", skuList);
Bundle details = billingService.getSkuDetails(3, getPackageName(), "inapp", query);
Log.i(TAG, "Billing.getSkuDetails");
Util.logBundle(TAG, details);
int details_response = details.getInt("RESPONSE_CODE");
Log.i(TAG, "Billing response=" + getIABResult(details_response));
if (details_response != 0)
return false;
// Check available SKUs
boolean found = false;
for (String item : details.getStringArrayList("DETAILS_LIST")) {
JSONObject object = new JSONObject(item);
if (SKU_DONATE.equals(object.getString("productId"))) {
found = true;
break;
}
}
Log.i(TAG, SKU_DONATE + "=" + found);
if (!found)
return false;
// Get purchases
Bundle purchases = billingService.getPurchases(3, getPackageName(), "inapp", null);
Log.i(TAG, "Billing.getPurchases");
Util.logBundle(TAG, purchases);
int purchases_response = purchases.getInt("RESPONSE_CODE");
Log.i(TAG, "Billing response=" + getIABResult(purchases_response));
if (purchases_response != 0)
return false;
// Check purchases
ArrayList<String> skus = purchases.getStringArrayList("INAPP_PURCHASE_ITEM_LIST");
return skus.contains(SKU_DONATE);
} catch (Throwable ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
return false;
}
}
private void IABinitiate() {
try {
Bundle bundle = billingService.getBuyIntent(3, getPackageName(), SKU_DONATE, "inapp", "");
Log.i(TAG, "Billing.getBuyIntent");
Util.logBundle(TAG, bundle);
int response = bundle.getInt("RESPONSE_CODE");
Log.i(TAG, "Billing response=" + getIABResult(response));
if (response == 0) {
PendingIntent pi = bundle.getParcelable("BUY_INTENT");
startIntentSenderForResult(
pi.getIntentSender(),
REQUEST_DONATION,
new Intent(),
Integer.valueOf(0),
Integer.valueOf(0),
Integer.valueOf(0));
}
} catch (Throwable ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
Toast.makeText(ActivityMain.this, ex.toString(), Toast.LENGTH_LONG).show();
}
}
private static String getIABResult(int responseCode) {
switch (responseCode) {
case 0:
return "BILLING_RESPONSE_RESULT_OK";

21
app/src/main/java/eu/faircode/netguard/Util.java
View File

@ -21,6 +21,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.security.MessageDigest;
import java.util.Set;
public class Util {
@ -64,6 +65,26 @@ public class Util {
});
}
public static boolean hasValidFingerprint(String tag, Context context) {
try {
PackageManager pm = context.getPackageManager();
String pkg = context.getPackageName();
PackageInfo info = pm.getPackageInfo(pkg, PackageManager.GET_SIGNATURES);
byte[] cert = info.signatures[0].toByteArray();
MessageDigest digest = MessageDigest.getInstance("SHA1");
byte[] bytes = digest.digest(cert);
StringBuilder sb = new StringBuilder();
for (int i = 0; i < bytes.length; ++i)
sb.append(Integer.toString(bytes[i] & 0xff, 16).toLowerCase());
String calculated = sb.toString();
String expected = context.getString(R.string.fingerprint);
return calculated.equals(expected);
} catch (Throwable ex) {
Log.e(tag, ex.toString() + "\n" + Log.getStackTraceString(ex));
return false;
}
}
public static void logExtras(String tag, Intent intent) {
logBundle(tag, intent.getExtras());
}

2
app/src/main/res/values/strings.xml
View File

@ -20,4 +20,6 @@
<string name="title_launch">Start application</string>
<string name="title_donate">Donate</string>
<string name="title_thanks">Thank you for your donation!</string>
<string name="fingerprint" translatable="false">ef46f813d2c8a064d72c936b9b96d1cccc989378</string>
</resources>