From 44c6deae1623d6819adb213b15f3975edaead1ee Mon Sep 17 00:00:00 2001 From: BernardLePro Date: Sun, 23 Aug 2015 22:42:22 +0200 Subject: [PATCH 1/5] Create two different flavors: with analytics disabled for a free (as in "free-speech") flavors and the usual version for Google Play --- QKSMS/build.gradle | 16 ++++++++-- QKSMS/src/main/AndroidManifest.xml | 2 +- .../main/java/com/moez/QKSMS/QKSMSApp.java | 4 +-- .../java/com/moez/QKSMS/QKSMSApp_.java | 4 +++ .../moez/QKSMS/common/AnalyticsManager.java | 31 +++++++++++++++++++ .../java/com/moez/QKSMS/QKSMSApp_.java | 11 +++++++ .../moez/QKSMS/common/AnalyticsManager.java | 9 +++--- 7 files changed, 66 insertions(+), 11 deletions(-) create mode 100644 QKSMS/src/noAnalytics/java/com/moez/QKSMS/QKSMSApp_.java create mode 100644 QKSMS/src/noAnalytics/java/com/moez/QKSMS/common/AnalyticsManager.java create mode 100644 QKSMS/src/withAnalytics/java/com/moez/QKSMS/QKSMSApp_.java rename QKSMS/src/{main => withAnalytics}/java/com/moez/QKSMS/common/AnalyticsManager.java (92%) diff --git a/QKSMS/build.gradle b/QKSMS/build.gradle index 241209fe..82c8b362 100644 --- a/QKSMS/build.gradle +++ b/QKSMS/build.gradle @@ -5,6 +5,17 @@ repositories { } android { + flavorDimensions "analytics" + + productFlavors { + withAnalytics { + dimension "analytics" + } + noAnalytics { + dimension "analytics" + } + } + lintOptions { checkReleaseBuilds false abortOnError false @@ -51,8 +62,7 @@ dependencies { compile 'com.android.support:appcompat-v7:22.2.1' compile 'com.android.support:support-v13:22.2.1' compile 'com.android.support:recyclerview-v7:22.2.1' - compile 'com.google.android.gms:play-services-analytics:7.5.0' - + withAnalyticsCompile 'com.google.android.gms:play-services-analytics:7.5.0' // External services - compile 'com.crittercism:crittercism-android-agent:5.0.3' + withAnalyticsCompile 'com.crittercism:crittercism-android-agent:5.0.3' } diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index 6d4ba301..2b913dad 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -38,7 +38,7 @@ Date: Mon, 24 Aug 2015 01:09:22 +0200 Subject: [PATCH 2/5] Cleaned up the base application and added an interface for the analytics manager --- QKSMS/src/main/AndroidManifest.xml | 2 +- .../{QKSMSApp.java => QKSMSAppBase.java} | 12 +++---- .../QKSMS/common/AnalyticsManagerBase.java | 22 +++++++++++++ .../com/moez/QKSMS/data/Conversation.java | 3 +- .../java/com/moez/QKSMS/ui/ThemeManager.java | 2 +- .../java/com/moez/QKSMS/QKSMSApp.java | 4 +++ .../java/com/moez/QKSMS/QKSMSApp_.java | 4 --- .../moez/QKSMS/common/AnalyticsManager.java | 26 ++++++++-------- .../QKSMS/{QKSMSApp_.java => QKSMSApp.java} | 2 +- .../moez/QKSMS/common/AnalyticsManager.java | 31 ++++++------------- 10 files changed, 59 insertions(+), 49 deletions(-) rename QKSMS/src/main/java/com/moez/QKSMS/{QKSMSApp.java => QKSMSAppBase.java} (95%) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/common/AnalyticsManagerBase.java create mode 100644 QKSMS/src/noAnalytics/java/com/moez/QKSMS/QKSMSApp.java delete mode 100644 QKSMS/src/noAnalytics/java/com/moez/QKSMS/QKSMSApp_.java rename QKSMS/src/withAnalytics/java/com/moez/QKSMS/{QKSMSApp_.java => QKSMSApp.java} (83%) diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index 2b913dad..6d4ba301 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -38,7 +38,7 @@ Date: Sun, 23 Aug 2015 22:42:22 +0200 Subject: [PATCH 3/5] Create two different flavors: with analytics disabled for a free (as in "free-speech") flavors and the usual version for Google Play --- QKSMS/build.gradle | 20 ++++++++++-- QKSMS/src/main/AndroidManifest.xml | 2 +- .../main/java/com/moez/QKSMS/QKSMSApp.java | 4 +-- .../java/com/moez/QKSMS/QKSMSApp_.java | 4 +++ .../moez/QKSMS/common/AnalyticsManager.java | 31 +++++++++++++++++++ .../java/com/moez/QKSMS/QKSMSApp_.java | 11 +++++++ .../moez/QKSMS/common/AnalyticsManager.java | 9 +++--- 7 files changed, 70 insertions(+), 11 deletions(-) create mode 100644 QKSMS/src/noAnalytics/java/com/moez/QKSMS/QKSMSApp_.java create mode 100644 QKSMS/src/noAnalytics/java/com/moez/QKSMS/common/AnalyticsManager.java create mode 100644 QKSMS/src/withAnalytics/java/com/moez/QKSMS/QKSMSApp_.java rename QKSMS/src/{main => withAnalytics}/java/com/moez/QKSMS/common/AnalyticsManager.java (92%) diff --git a/QKSMS/build.gradle b/QKSMS/build.gradle index 2a5b83ac..6ecf2a02 100644 --- a/QKSMS/build.gradle +++ b/QKSMS/build.gradle @@ -5,6 +5,21 @@ repositories { } android { + flavorDimensions "analytics" + + productFlavors { + withAnalytics { + dimension "analytics" + } + noAnalytics { + dimension "analytics" + } + } + + lintOptions { + checkReleaseBuilds false + abortOnError false + } compileSdkVersion 22 buildToolsVersion '23.0.0' @@ -64,8 +79,7 @@ dependencies { compile 'com.android.support:appcompat-v7:22.2.1' compile 'com.android.support:support-v13:22.2.1' compile 'com.android.support:recyclerview-v7:22.2.1' - compile 'com.google.android.gms:play-services-analytics:7.5.0' - + withAnalyticsCompile 'com.google.android.gms:play-services-analytics:7.5.0' // External services - compile 'com.crittercism:crittercism-android-agent:5.0.3' + withAnalyticsCompile 'com.crittercism:crittercism-android-agent:5.0.3' } diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index 6d4ba301..2b913dad 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -38,7 +38,7 @@ Date: Mon, 24 Aug 2015 01:09:22 +0200 Subject: [PATCH 4/5] Cleaned up the base application and added an interface for the analytics manager --- QKSMS/src/main/AndroidManifest.xml | 2 +- .../{QKSMSApp.java => QKSMSAppBase.java} | 12 +++---- .../QKSMS/common/AnalyticsManagerBase.java | 22 +++++++++++++ .../com/moez/QKSMS/data/Conversation.java | 3 +- .../java/com/moez/QKSMS/ui/ThemeManager.java | 2 +- .../java/com/moez/QKSMS/QKSMSApp.java | 4 +++ .../java/com/moez/QKSMS/QKSMSApp_.java | 4 --- .../moez/QKSMS/common/AnalyticsManager.java | 26 ++++++++-------- .../QKSMS/{QKSMSApp_.java => QKSMSApp.java} | 2 +- .../moez/QKSMS/common/AnalyticsManager.java | 31 ++++++------------- 10 files changed, 59 insertions(+), 49 deletions(-) rename QKSMS/src/main/java/com/moez/QKSMS/{QKSMSApp.java => QKSMSAppBase.java} (95%) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/common/AnalyticsManagerBase.java create mode 100644 QKSMS/src/noAnalytics/java/com/moez/QKSMS/QKSMSApp.java delete mode 100644 QKSMS/src/noAnalytics/java/com/moez/QKSMS/QKSMSApp_.java rename QKSMS/src/withAnalytics/java/com/moez/QKSMS/{QKSMSApp_.java => QKSMSApp.java} (83%) diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index 2b913dad..6d4ba301 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -38,7 +38,7 @@ Date: Mon, 24 Aug 2015 21:14:49 +0200 Subject: [PATCH 5/5] Renamed variables --- QKSMS/src/main/java/com/moez/QKSMS/QKSMSAppBase.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/QKSMSAppBase.java b/QKSMS/src/main/java/com/moez/QKSMS/QKSMSAppBase.java index 470c618f..b32dd50b 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/QKSMSAppBase.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/QKSMSAppBase.java @@ -51,7 +51,7 @@ public class QKSMSAppBase extends Application { private SearchRecentSuggestions mRecentSuggestions; private TelephonyManager mTelephonyManager; private String mCountryIso; - private static QKSMSAppBase sQKSMSAppBase = null; + private static QKSMSAppBase sQKSMSApp = null; private PduLoaderManager mPduLoaderManager; private ThumbnailManager mThumbnailManager; private DrmManagerClient mDrmManagerClient; @@ -69,7 +69,7 @@ public class QKSMSAppBase extends Application { new StrictMode.ThreadPolicy.Builder().detectAll().penaltyLog().build()); } - sQKSMSAppBase = this; + sQKSMSApp = this; loadDefaultPreferenceValues(); @@ -123,7 +123,7 @@ public class QKSMSAppBase extends Application { } synchronized public static QKSMSAppBase getApplication() { - return sQKSMSAppBase; + return sQKSMSApp; } @Override