From 38e28b3e6ed3915f2e811b8f4358e1facb296900 Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Fri, 20 May 2016 18:03:45 +0530 Subject: [PATCH] Updates Signed-off-by: Akhil Narang --- AndroidManifest.xml | 2 +- res/values/strings.xml | 30 ++++++------ src/android/romstats/AnonymousStats.java | 61 ------------------------ src/android/romstats/Const.java | 1 - src/android/romstats/Utilities.java | 17 +------ 5 files changed, 17 insertions(+), 94 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bb41fce..8d6a819 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="1.0" > - ResurrectionRemix Stats + RR Statistics Anonymous Usage Data @@ -24,9 +24,9 @@ Statistics Opted-In ROM Statistics Enable or Disable Anonymous Statistics - + <a href="http://www.cyanogenmod.org/blog/cmstats-what-it-is-and-why-you-should-opt-in">Learn More</a> - + ROM Statistics @@ -35,7 +35,7 @@ Opting into ROM Statistics will allow non-personal data to be submitted to the developers of the ROM to track unique installations across devices. The information submitted includes an unique identifier, which does not compromise your privacy or personal data. The data is submitted on a regular interval decided by the ROM developer.\n\nFor an example of the data that is submitted, tap on Preview Data. - + Settings Enable reporting Persistent opt-out @@ -43,8 +43,8 @@ %s View stats Learn more - - + + Information Last reported Reporting interval @@ -54,28 +54,28 @@ Next report App signature - + Hide icon from launcher Application launcher icon will be hidden from your App Drawer - + Uninstall Yes No - + Unique ID Device Version Country - Carrier - ROM Name + Carrier + ROM Name ROM Version - + About & Support About Change log Show the change log - Web site - http://forum.xda-developers.com/showthread.php?t=2087099 - + Google+ + https://plus.google.com/u/0/communities/109352646351468373340 + diff --git a/src/android/romstats/AnonymousStats.java b/src/android/romstats/AnonymousStats.java index 1625a91..d345e66 100644 --- a/src/android/romstats/AnonymousStats.java +++ b/src/android/romstats/AnonymousStats.java @@ -146,67 +146,6 @@ public boolean onPreferenceClick(Preference preference) { int tFrame = (int) Utilities.getTimeFrame(); mPrefHolder.setSummary(getResources().getQuantityString(R.plurals.reporting_interval_days, tFrame, tFrame)); - // show app signature - if (true) { - String appSignature = ""; - PackageInfo packageInfo = null; - - try { - packageInfo = this.getPackageManager().getPackageInfo(this.getPackageName(), PackageManager.GET_SIGNATURES); - } catch (NameNotFoundException e) { - e.printStackTrace(); - } - Signature[] signatures = packageInfo.signatures; - - /* - Log.d("TAG", "Internal signature: " + signatures[0].toCharsString()); - - InputStream input = new ByteArrayInputStream(signatures[0].toByteArray()); - - CertificateFactory cf = null; - try { - cf = CertificateFactory.getInstance("X509"); - } catch (CertificateException e) { - e.printStackTrace(); - } - X509Certificate c = null; - try { - c = (X509Certificate) cf.generateCertificate(input); - } catch (CertificateException e) { - e.printStackTrace(); - } - - try { - MessageDigest md = MessageDigest.getInstance("SHA1"); - byte[] publicKey = md.digest(c.getPublicKey().getEncoded()); - - StringBuffer hexString = new StringBuffer(); - for (int i = 0; i < publicKey.length; i++) { - String appendString = Integer.toHexString(0xFF & publicKey[i]); - if (appendString.length() == 1) { - hexString.append("0"); - } - if (hexString.length() > 0) { - hexString.append(":"); - } - hexString.append(appendString); - } - - appSignature = hexString.toString(); - } catch (NoSuchAlgorithmException e1) { - e1.printStackTrace(); - }*/ - - if (Const.CERT_PUB_KEY.equals(new String(signatures[0].toChars()))) { - appSignature = "Valid"; - } else { - appSignature = "Invalid"; - } - - mPrefHolder = prefSet.findPreference("pref_app_signature"); - mPrefHolder.setSummary(appSignature); - } - // Cancel notification on app open, in case it doesn't AutoCancel NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); nm.cancel(Utilities.NOTIFICATION_ID); diff --git a/src/android/romstats/Const.java b/src/android/romstats/Const.java index 03fb188..bc03325 100644 --- a/src/android/romstats/Const.java +++ b/src/android/romstats/Const.java @@ -14,6 +14,5 @@ public class Const { public static final int ROMSTATS_REPORTING_MODE_NEW = 0; // new CM10.1: no user prompt, default TRUE, first time after tframe public static final int ROMSTATS_REPORTING_MODE_OLD = 1; // old CM10 : user prompt, default FALSE, first time immediately - public static final String CERT_PUB_KEY = "3082030d308201f5a00302010202042b7cebb9300d06092a864886f70d01010b05003037310b30090603550406130255533110300e060355040a1307416e64726f6964311630140603550403130d416e64726f6964204465627567301e170d3133303331383135323732375a170d3433303331313135323732375a3037310b30090603550406130255533110300e060355040a1307416e64726f6964311630140603550403130d416e64726f696420446562756730820122300d06092a864886f70d01010105000382010f003082010a0282010100890a1dec24c15e70e200eef3f7d876b9848e1746077420c243a72d9b987168896ed27c9ea608d7884b3e572b56e4355c7ab8c6f967d179ceda97609d5dd693f438f68514475c4ec0e018bad334069dcf5391fa2a1a85ac5bab2a9af061ef1762d808542884fc6472a108938d867eef19cbc000993d46cf0ef9516c50290e4e844102ddd73004503447960ff934942bbf49aa33338cc927da611cb0516d3c2cd021cff7acd96fa700e44b31558e9ea77a0bf298d4df9b6ac95e531b6a2a85b35af3581097fed5794d44bff29ff190b94aaed448a3c545aac20ad31ff88c59f422c2f208a2b3b18a3482f26cd563ef5c91680992d3b2f9d178659f41f98910657f0203010001a321301f301d0603551d0e04160414f22c478bcbcf005576c9b96ed36eb4946babeb73300d06092a864886f70d01010b050003820101004c247e16396d674b72862024ce6c9682ebc78b4e48d26e93cbebf1c5f9d4642245c9710d37d7eee2c85c73fc958a9394de4142952ef8123164c6c9182e3b27cbb26d8c8d9af3a7ba0b28fa7fafa12c6270d63b03813165b5d3ce587436b523db6ac168a7a79db85ccb25dcb4f0840a9cdaabff6dd63523f26b1060f6ee1c18fa746e3120a1c17fae302bfdadc7638e713e566684e715c9c2934b55342347fdbe991c4a0f8514b2a7e7853aaa3d3fc7622d6efd259993b34ed027ad1bdd37b97058c177fef914112e2277f05114857f3481cf947dd563d58cd29b66abea2c46255ce2a9e9a4407fb3629019490c4f4d5291fab4d423b75b5c283cbadf7de2b68f"; } diff --git a/src/android/romstats/Utilities.java b/src/android/romstats/Utilities.java index 9435dd6..28341da 100644 --- a/src/android/romstats/Utilities.java +++ b/src/android/romstats/Utilities.java @@ -136,22 +136,7 @@ public static String digest(String input) { } } - public static String getSigningCert(Context context) { - PackageInfo packageInfo = null; - - try { - packageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), PackageManager.GET_SIGNATURES); - } catch (NameNotFoundException e) { - e.printStackTrace(); - } - Signature[] signatures = packageInfo.signatures; - - String signingCertHash = digest(signatures[0].toCharsString()); - - return signingCertHash; - } - - + /** * Gets the Ask First value * 0: RomStats will behave like CMStats, starts reporting automatically after the tframe (default)