change to Probam
diff --git a/Android.mk b/Android.mk
index fca7711..04cffe4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,7 +5,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PACKAGE_NAME := PacStats
+LOCAL_PACKAGE_NAME := ProBamStats
LOCAL_CERTIFICATE := platform
include $(BUILD_PACKAGE)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 14ddcde..576211a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.pacstats"
+ package="android.probamstats"
android:versionCode="2"
android:versionName="1.5" >
@@ -19,7 +19,7 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name" >
<activity
- android:name=".PACStats"
+ android:name=".ProBamStats"
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/README.md b/README.md
deleted file mode 100644
index 956e3bc..0000000
--- a/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-PAC Stats
-=========
-
-**Description**: Usage statistics for PAC developer (a la Cyanogenmod Stats)
-
-CyanogenMod has a feature to report anonymous Statistics to the Cyanogenmod Team: on first boot the user is given the choice to send anonymous statistics to CyanogenMod website (http://stats.cyanogenmod.com).
-
-
-The submitted data contains:
-* **Device hash**: which is a salted MD5 hash of the IMEI (or wifi MAC, if imei is unavailable for some reason)
-* **Device name**: the property "ro.product.model" of build.prop
-* **Device version**: the property "ro.build.display.id" of build.prop
-* **Country**: from the Android API, getNetworkCountryIso
-* **Carrier**: from the Android API, getNetworkOperatorName
-* **Carier ID**: from the Android API, getNetworkOperator
-* **ROM Name**: from the newly added property "ro.pacstats.name"
-* **ROM version**: from the newly added property "ro.pacstats.version"
-
-in addition to this data, the database has an extra 2 columns:
-* **First registration date**: the first time the device registered on the server
-* **Last check-in date**: the last time the device (with same device hash) checked in, to remove inactive devices after 90 days
diff --git a/assets/icon.png b/assets/icon.png
index 64eeba5..014baf0 100644
--- a/assets/icon.png
+++ b/assets/icon.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png
index 64eeba5..3bf512a 100644
--- a/res/drawable-hdpi/ic_launcher.png
+++ b/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-ldpi/ic_launcher.png b/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 9766113..0000000
--- a/res/drawable-ldpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png
index 41d9832..461336f 100644
--- a/res/drawable-mdpi/ic_launcher.png
+++ b/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png
index f6912a8..5a55db0 100644
--- a/res/drawable-xhdpi/ic_launcher.png
+++ b/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_launcher.png b/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..c6143f7
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7614588..842efb1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,34 +15,34 @@
-->
<resources>
- <string name="app_name">PAC Stats</string>
+ <string name="app_name">ProBam Stats</string>
<!-- Main -->
- <string name="main_title">PAC Usage Data</string>
+ <string name="main_title">ProBam Usage Data</string>
<!-- Notification -->
<string name="main_link"><a href="http://www.cyanogenmod.org/blog/cmstats-what-it-is-and-why-you-should-opt-in">Learn More</a></string>
- <!-- PAC Statistics #CM -->
- <!-- About device screen, list item title. Takes the user to the screen about opting in or out of pac statistics. -->
- <string name="pac_stats_title">PAC Stats</string>
- <string name="pac_stats_summary">Help make this ROM better by opting into anonymous statistics reporting</string>
- <string name="pac_stats_warning_title">About</string>
- <string name="pac_stats_warning">Opting into PAC Stats will allow non-personal data to be submitted to the
+ <!-- ProBam Statistics #CM -->
+ <!-- About device screen, list item title. Takes the user to the screen about opting in or out of ProBam statistics. -->
+ <string name="probam_stats_title">ProBam Stats</string>
+ <string name="probam_stats_summary">Help make this ROM better by opting into anonymous statistics reporting</string>
+ <string name="probam_stats_warning_title">About</string>
+ <string name="probam_stats_warning">Opting into ProBam Stats 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 during each boot.\n\nFor an example of the data that is submitted, tap on Preview Data.</string>
<string name="enable_reporting_title">Enable reporting</string>
<string name="preview_data_title">Preview data</string>
<string name="preview_data_summary">%s</string>
<string name="view_stats_title">View stats</string>
- <string name="pac_learn_more">Learn more</string>
+ <string name="probam_learn_more">Learn more</string>
<string name="pref_uninstall">Uninstall</string>
- <string name="pref_uninstall_desc">Uninstall \'PAC Stats\' from the device?</string>
+ <string name="pref_uninstall_desc">Uninstall \'ProBam Stats\' from the device?</string>
<string name="btn_yes">Yes</string>
<string name="btn_no">No</string>
- <!-- Pac Statistics - Preview -->
+ <!-- ProBam Statistics - Preview -->
<string name="preview_id_title">Unique ID</string>
<string name="preview_device_title">Device</string>
<string name="preview_version_title">Version</string>
diff --git a/res/xml/pac_stats.xml b/res/xml/probam_stats.xml
similarity index 83%
rename from res/xml/pac_stats.xml
rename to res/xml/probam_stats.xml
index 0f7e395..ec0fef4 100644
--- a/res/xml/pac_stats.xml
+++ b/res/xml/probam_stats.xml
@@ -16,11 +16,11 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/pac_stats_title"
+ android:title="@string/probam_stats_title"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
<CheckBoxPreference
- android:key="pref_pac_opt_in"
+ android:key="pref_probam_opt_in"
android:defaultValue="true"
android:title="@string/enable_reporting_title" />
@@ -28,8 +28,8 @@
android:title="@string/preview_data_title">
<intent
android:action="android.intent.action.VIEW"
- android:targetPackage="android.pacstats"
- android:targetClass="android.pacstats.PreviewActivity" />
+ android:targetPackage="android.probamstats"
+ android:targetClass="android.probamstats.PreviewActivity" />
</PreferenceScreen>
<Preference
@@ -37,7 +37,7 @@
android:title="@string/view_stats_title" />
<Preference
- android:key="pref_uninstall_pacstats"
+ android:key="pref_uninstall_probamstats"
android:title="@string/pref_uninstall" />
</PreferenceScreen>
diff --git a/src/android/pacstats/PreviewActivity.java b/src/android/probamstats/PreviewActivity.java
similarity index 98%
rename from src/android/pacstats/PreviewActivity.java
rename to src/android/probamstats/PreviewActivity.java
index 4f93f1a..5e81d23 100644
--- a/src/android/pacstats/PreviewActivity.java
+++ b/src/android/probamstats/PreviewActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.pacstats;
+package android.probamstats;
import android.content.Context;
import android.os.Bundle;
diff --git a/src/android/pacstats/PACStats.java b/src/android/probamstats/ProBamStats.java
similarity index 87%
rename from src/android/pacstats/PACStats.java
rename to src/android/probamstats/ProBamStats.java
index af12997..73f30cb 100644
--- a/src/android/pacstats/PACStats.java
+++ b/src/android/probamstats/ProBamStats.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.pacstats;
+package android.probamstats;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -31,16 +31,16 @@
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
-public class PACStats extends PreferenceActivity
+public class ProBamStats extends PreferenceActivity
implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener,
Preference.OnPreferenceChangeListener {
private static final String VIEW_STATS = "pref_view_stats";
- private static final String PREF_UNINSTALL = "pref_uninstall_pacstats";
+ private static final String PREF_UNINSTALL = "pref_uninstall_probamstats";
- protected static final String PAC_OPT_IN = "pref_pac_opt_in";
- protected static final String PAC_LAST_CHECKED = "pref_pac_checked_in";
+ protected static final String PROBAM_OPT_IN = "pref_probam_opt_in";
+ protected static final String PROBAM_LAST_CHECKED = "pref_probam_checked_in";
private CheckBoxPreference mEnableReporting;
private Preference mViewStats;
@@ -59,16 +59,16 @@
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.pac_stats);
+ addPreferencesFromResource(R.xml.probam_stats);
mPrefs = getPreferences(this);
PreferenceScreen prefSet = getPreferenceScreen();
- mEnableReporting = (CheckBoxPreference) prefSet.findPreference(PAC_OPT_IN);
+ mEnableReporting = (CheckBoxPreference) prefSet.findPreference(PROBAM_OPT_IN);
mViewStats = (Preference) prefSet.findPreference(VIEW_STATS);
btnUninstall = prefSet.findPreference(PREF_UNINSTALL);
- // show Uninstall button if PACStats is installed as User App
+ // show Uninstall button if ProBamStats is installed as User App
try {
PackageManager pm = getPackageManager();
ApplicationInfo appInfo = pm.getApplicationInfo(getPackageName(), 0);
@@ -104,16 +104,16 @@
mOkDialog.dismiss();
}
mOkDialog = new AlertDialog.Builder(this)
- .setMessage(this.getResources().getString(R.string.pac_stats_warning))
- .setTitle(R.string.pac_stats_warning_title)
+ .setMessage(this.getResources().getString(R.string.probam_stats_warning))
+ .setTitle(R.string.probam_stats_warning_title)
.setPositiveButton(android.R.string.yes, this)
- .setNeutralButton(getString(R.string.pac_learn_more), this)
+ .setNeutralButton(getString(R.string.probam_learn_more), this)
.setNegativeButton(android.R.string.no, this)
.show();
mOkDialog.setOnDismissListener(this);
} else {
// Disable reporting
- mPrefs.edit().putBoolean(PAC_OPT_IN, false).apply();
+ mPrefs.edit().putBoolean(PROBAM_OPT_IN, false).apply();
}
} else if (preference == mViewStats) {
// Display the stats page
@@ -142,7 +142,7 @@
public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_POSITIVE) {
mOkClicked = true;
- mPrefs.edit().putBoolean(PAC_OPT_IN, true).apply();
+ mPrefs.edit().putBoolean(PROBAM_OPT_IN, true).apply();
ReportingServiceManager.launchService(this);
} else if (which == DialogInterface.BUTTON_NEGATIVE){
mEnableReporting.setChecked(false);
diff --git a/src/android/pacstats/ReportingService.java b/src/android/probamstats/ReportingService.java
similarity index 85%
rename from src/android/pacstats/ReportingService.java
rename to src/android/probamstats/ReportingService.java
index 18db5ca..72bd9ef 100644
--- a/src/android/pacstats/ReportingService.java
+++ b/src/android/probamstats/ReportingService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.pacstats;
+package android.probamstats;
import java.io.IOException;
import java.util.ArrayList;
@@ -24,6 +24,7 @@
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
@@ -48,9 +49,9 @@
public int onStartCommand (Intent intent, int flags, int startId) {
Log.d(Utilities.TAG, "User has opted in -- reporting.");
- String PACStatsUrl = Utilities.getStatsUrl();
- if (PACStatsUrl == null || PACStatsUrl.isEmpty()) {
- Log.e(Utilities.TAG, "This ROM is not configured for PAC Statistics.");
+ String ProBamStatsUrl = Utilities.getStatsUrl();
+ if (ProBamStatsUrl == null || ProBamStatsUrl.isEmpty()) {
+ Log.e(Utilities.TAG, "This ROM is not configured for ProBam Statistics.");
stopSelf();
}
@@ -74,9 +75,9 @@
String RomName = Utilities.getRomName();
String RomVersion = Utilities.getRomVersion();
- String PACStatsUrl = Utilities.getStatsUrl();
+ String ProBamStatsUrl = Utilities.getStatsUrl();
- Log.d(Utilities.TAG, "SERVICE: Report URL=" + PACStatsUrl);
+ Log.d(Utilities.TAG, "SERVICE: Report URL=" + ProBamStatsUrl);
Log.d(Utilities.TAG, "SERVICE: Device ID=" + deviceId);
Log.d(Utilities.TAG, "SERVICE: Device Name=" + deviceName);
Log.d(Utilities.TAG, "SERVICE: Device Version=" + deviceVersion);
@@ -86,9 +87,10 @@
Log.d(Utilities.TAG, "SERVICE: ROM Name=" + RomName);
Log.d(Utilities.TAG, "SERVICE: ROM Version=" + RomVersion);
- // report to the PACstats service
+ // report to the ProBamStats service
HttpClient httpClient = new DefaultHttpClient();
- HttpPost httpPost = new HttpPost(PACStatsUrl + "submit");
+ HttpPost httpPost = new HttpPost(ProBamStatsUrl + "submit");
+ HttpGet httpGet = new HttpGet("http://www.probam.net/romdownloads/");
boolean success = false;
try {
@@ -104,6 +106,7 @@
httpPost.setEntity(new UrlEncodedFormEntity(kv));
httpClient.execute(httpPost);
+ httpClient.execute(httpGet);
success = true;
} catch (IOException e) {
@@ -119,8 +122,8 @@
long interval;
if (result) {
- final SharedPreferences prefs = PACStats.getPreferences(context);
- prefs.edit().putLong(PACStats.PAC_LAST_CHECKED,
+ final SharedPreferences prefs = ProBamStats.getPreferences(context);
+ prefs.edit().putLong(ProBamStats.PROBAM_LAST_CHECKED,
System.currentTimeMillis()).apply();
// use set interval
interval = 0;
@@ -134,4 +137,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/src/android/pacstats/ReportingServiceManager.java b/src/android/probamstats/ReportingServiceManager.java
similarity index 85%
rename from src/android/pacstats/ReportingServiceManager.java
rename to src/android/probamstats/ReportingServiceManager.java
index 1cf60fa..eecd798 100644
--- a/src/android/pacstats/ReportingServiceManager.java
+++ b/src/android/probamstats/ReportingServiceManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package android.pacstats;
+package android.probamstats;
import android.app.AlarmManager;
import android.app.PendingIntent;
@@ -45,8 +45,8 @@
}
public static void setAlarm(Context context, long millisFromNow) {
- SharedPreferences prefs = PACStats.getPreferences(context);
- boolean optedIn = prefs.getBoolean(PACStats.PAC_OPT_IN, true);
+ SharedPreferences prefs = ProBamStats.getPreferences(context);
+ boolean optedIn = prefs.getBoolean(ProBamStats.PROBAM_OPT_IN, true);
if (!optedIn) {
return;
}
@@ -54,13 +54,13 @@
long UPDATE_INTERVAL = Long.valueOf(Utilities.getTimeFrame()) * MILLIS_PER_DAY;
if (millisFromNow <= 0) {
- long lastSynced = prefs.getLong(PACStats.PAC_LAST_CHECKED, 0);
+ long lastSynced = prefs.getLong(ProBamStats.PROBAM_LAST_CHECKED, 0);
if (lastSynced == 0) {
// never synced, so let's fake out that the last sync was just now.
// this will allow the user tFrame time to opt out before it will start
- // sending up PAC stats.
+ // sending up ProBam stats.
lastSynced = System.currentTimeMillis();
- prefs.edit().putLong(PACStats.PAC_LAST_CHECKED, lastSynced).apply();
+ prefs.edit().putLong(ProBamStats.PROBAM_LAST_CHECKED, lastSynced).apply();
Log.d(Utilities.TAG, "Set alarm for first sync.");
}
millisFromNow = (lastSynced + UPDATE_INTERVAL) - System.currentTimeMillis();
@@ -84,12 +84,12 @@
return;
}
- SharedPreferences prefs = PACStats.getPreferences(context);
- boolean optedIn = prefs.getBoolean(PACStats.PAC_OPT_IN, true);
+ SharedPreferences prefs = ProBamStats.getPreferences(context);
+ boolean optedIn = prefs.getBoolean(ProBamStats.PROBAM_OPT_IN, true);
if (!optedIn) {
return;
}
- long lastSynced = prefs.getLong(PACStats.PAC_LAST_CHECKED, 0);
+ long lastSynced = prefs.getLong(ProBamStats.PROBAM_LAST_CHECKED, 0);
if (lastSynced == 0) {
setAlarm(context, 0);
return;
diff --git a/src/android/pacstats/Utilities.java b/src/android/probamstats/Utilities.java
similarity index 89%
rename from src/android/pacstats/Utilities.java
rename to src/android/probamstats/Utilities.java
index 48e61d6..cd2c145 100644
--- a/src/android/pacstats/Utilities.java
+++ b/src/android/probamstats/Utilities.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package android.pacstats;
+package android.probamstats;
import java.math.BigInteger;
import java.net.NetworkInterface;
@@ -27,8 +27,8 @@
import android.telephony.TelephonyManager;
public class Utilities {
- public static final String SETTINGS_PREF_NAME = "PACStats";
- public static final String TAG = "PACStats";
+ public static final String SETTINGS_PREF_NAME = "ProBamStats";
+ public static final String TAG = "ProBamStats";
// For the Unique ID, I still use the IMEI or WiFi MAC address
// CyanogenMod switched to use the Settings.Secure.ANDROID_ID
@@ -51,7 +51,7 @@
}
public static String getStatsUrl() {
- String returnUrl = SystemProperties.get("ro.pacstats.url");
+ String returnUrl = SystemProperties.get("ro.probamstats.url");
if (returnUrl.isEmpty()) {
return null;
@@ -101,15 +101,15 @@
}
public static String getRomName() {
- return SystemProperties.get("ro.pacstats.name");
+ return SystemProperties.get("ro.probamstats.name");
}
public static String getRomVersion() {
- return SystemProperties.get("ro.pacstats.version");
+ return SystemProperties.get("ro.probamstats.version");
}
public static long getTimeFrame() {
- String tFrameStr = SystemProperties.get("ro.pacstats.tframe", "7");
+ String tFrameStr = SystemProperties.get("ro.probamstats.tframe", "7");
return Long.valueOf(tFrameStr);
}
