Cleaned up the base application and added an interface for the analytics manager

This commit is contained in:
BernardLePro
2015-08-24 01:09:22 +02:00
parent 2fae440f18
commit 3282ea850a
10 changed files with 59 additions and 49 deletions
+1 -1
View File
@@ -38,7 +38,7 @@
<uses-permission android:name="com.android.vending.BILLING" /> <uses-permission android:name="com.android.vending.BILLING" />
<application <application
android:name=".QKSMSApp_" android:name=".QKSMSApp"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher_teal" android:icon="@mipmap/ic_launcher_teal"
android:label="@string/app_name" android:label="@string/app_name"
@@ -45,13 +45,13 @@ import com.squareup.leakcanary.RefWatcher;
import java.util.Locale; import java.util.Locale;
public class QKSMSApp extends Application { public class QKSMSAppBase extends Application {
public static final String LOG_TAG = "Mms"; public static final String LOG_TAG = "Mms";
private SearchRecentSuggestions mRecentSuggestions; private SearchRecentSuggestions mRecentSuggestions;
private TelephonyManager mTelephonyManager; private TelephonyManager mTelephonyManager;
private String mCountryIso; private String mCountryIso;
private static QKSMSApp sQKSMSApp = null; private static QKSMSAppBase sQKSMSAppBase = null;
private PduLoaderManager mPduLoaderManager; private PduLoaderManager mPduLoaderManager;
private ThumbnailManager mThumbnailManager; private ThumbnailManager mThumbnailManager;
private DrmManagerClient mDrmManagerClient; private DrmManagerClient mDrmManagerClient;
@@ -69,7 +69,7 @@ public class QKSMSApp extends Application {
new StrictMode.ThreadPolicy.Builder().detectAll().penaltyLog().build()); new StrictMode.ThreadPolicy.Builder().detectAll().penaltyLog().build());
} }
sQKSMSApp = this; sQKSMSAppBase = this;
loadDefaultPreferenceValues(); loadDefaultPreferenceValues();
@@ -100,7 +100,7 @@ public class QKSMSApp extends Application {
} }
public static RefWatcher getRefWatcher(Context context) { public static RefWatcher getRefWatcher(Context context) {
QKSMSApp application = (QKSMSApp) context.getApplicationContext(); QKSMSAppBase application = (QKSMSAppBase) context.getApplicationContext();
return application.refWatcher; return application.refWatcher;
} }
@@ -122,8 +122,8 @@ public class QKSMSApp extends Application {
//sendBroadcast(new Intent(SmsReceiverService.ACTION_SEND_INACTIVE_MESSAGE, null, this, SmsReceiver.class)); //sendBroadcast(new Intent(SmsReceiverService.ACTION_SEND_INACTIVE_MESSAGE, null, this, SmsReceiver.class));
} }
synchronized public static QKSMSApp getApplication() { synchronized public static QKSMSAppBase getApplication() {
return sQKSMSApp; return sQKSMSAppBase;
} }
@Override @Override
@@ -0,0 +1,22 @@
package com.moez.QKSMS.common;
import android.content.Context;
interface AnalyticsManagerBase {
String TAG = "AnalyticsManager";
boolean LOCAL_LOGV = false;
String CATEGORY_MESSAGES = "messages";
// Note: For preferences events, the action will just be the preference value.
String CATEGORY_PREFERENCE_CHANGE = "preference_change";
String CATEGORY_PREFERENCE_CLICK = "preference_click";
String CATEGORY_REPORT = "report";
String ACTION_SEND_MESSAGE = "send_message";
String ACTION_ATTACH_IMAGE = "attach_image";
String ACTION_ATTACH_FROM_CAMERA = "attach_from_camera";
void init(Context context);
void sendEvent(String category, String action, String label);
void sendEvent(String category, String action, String label, long value);
}
@@ -22,6 +22,7 @@ import android.util.Log;
import com.android.mms.transaction.MmsMessageSender; import com.android.mms.transaction.MmsMessageSender;
import com.google.android.mms.pdu_alt.PduHeaders; import com.google.android.mms.pdu_alt.PduHeaders;
import com.moez.QKSMS.QKSMSAppBase;
import com.moez.QKSMS.mmssms.Utils; import com.moez.QKSMS.mmssms.Utils;
import com.moez.QKSMS.LogTag; import com.moez.QKSMS.LogTag;
import com.moez.QKSMS.QKSMSApp; import com.moez.QKSMS.QKSMSApp;
@@ -802,7 +803,7 @@ public class Conversation {
sDeletingThreads = true; sDeletingThreads = true;
String selection = deleteAll ? null : "locked=0"; String selection = deleteAll ? null : "locked=0";
QKSMSApp app = QKSMSApp.getApplication(); QKSMSAppBase app = QKSMSApp.getApplication();
//app.getPduLoaderManager().clear(); //app.getPduLoaderManager().clear();
//app.getThumbnailManager().clear(); //app.getThumbnailManager().clear();
@@ -624,7 +624,7 @@ public class ThemeManager {
public static void setColour(int color) { public static void setColour(int color) {
AnalyticsManager.INSTANCE.sendEvent( AnalyticsManager.getInstance().sendEvent(
AnalyticsManager.CATEGORY_PREFERENCE_CHANGE, AnalyticsManager.CATEGORY_PREFERENCE_CHANGE,
SettingsFragment.CATEGORY_THEME, SettingsFragment.CATEGORY_THEME,
getColorString(color) getColorString(color)
@@ -0,0 +1,4 @@
package com.moez.QKSMS;
public class QKSMSApp extends QKSMSAppBase {
}
@@ -1,4 +0,0 @@
package com.moez.QKSMS;
public class QKSMSApp_ extends QKSMSApp {
}
@@ -2,30 +2,30 @@ package com.moez.QKSMS.common;
import android.content.Context; import android.content.Context;
public enum AnalyticsManager { public class AnalyticsManager implements AnalyticsManagerBase {
INSTANCE; private AnalyticsManager() {
}
private final static String TAG = "AnalyticsManager"; private static class AnalyticsManagerHolder {
private final static boolean LOCAL_LOGV = false; private final static AnalyticsManager INSTANCE = new AnalyticsManager();
public final static String CATEGORY_MESSAGES = "messages"; }
// Note: For preferences events, the action will just be the preference value.
public final static String CATEGORY_PREFERENCE_CHANGE = "preference_change";
public final static String CATEGORY_PREFERENCE_CLICK = "preference_click";
public final static String CATEGORY_REPORT = "report";
public final static String ACTION_SEND_MESSAGE = "send_message";
public final static String ACTION_ATTACH_IMAGE = "attach_image";
public final static String ACTION_ATTACH_FROM_CAMERA = "attach_from_camera";
public static AnalyticsManager getInstance() { public static AnalyticsManager getInstance() {
return INSTANCE; return AnalyticsManagerHolder.INSTANCE;
} }
@Override
public void init(Context context) { public void init(Context context) {
} }
@Override
public void sendEvent(String category, String action, String label) { public void sendEvent(String category, String action, String label) {
} }
@Override
public void sendEvent(String category, String action, String label, long value) { public void sendEvent(String category, String action, String label, long value) {
} }
} }
@@ -2,7 +2,7 @@ package com.moez.QKSMS;
import com.crittercism.app.Crittercism; import com.crittercism.app.Crittercism;
public class QKSMSApp_ extends QKSMSApp { public class QKSMSApp extends QKSMSAppBase {
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
@@ -8,35 +8,22 @@ import com.google.android.gms.analytics.HitBuilders;
import com.google.android.gms.analytics.Tracker; import com.google.android.gms.analytics.Tracker;
import com.moez.QKSMS.R; import com.moez.QKSMS.R;
public enum AnalyticsManager { public class AnalyticsManager implements AnalyticsManagerBase {
INSTANCE; private AnalyticsManager() {
}
private final static String TAG = "AnalyticsManager"; private static class AnalyticsManagerHolder {
private final static boolean LOCAL_LOGV = false; private final static AnalyticsManager INSTANCE = new AnalyticsManager();
}
/** public static AnalyticsManager getInstance() {
* Event categories return AnalyticsManagerHolder.INSTANCE;
*/ }
public final static String CATEGORY_MESSAGES = "messages";
// Note: For preferences events, the action will just be the preference value.
public final static String CATEGORY_PREFERENCE_CHANGE = "preference_change";
public final static String CATEGORY_PREFERENCE_CLICK = "preference_click";
public final static String CATEGORY_REPORT = "report";
/**
* Event actions
*/
public final static String ACTION_SEND_MESSAGE = "send_message";
public final static String ACTION_ATTACH_IMAGE = "attach_image";
public final static String ACTION_ATTACH_FROM_CAMERA = "attach_from_camera";
private boolean mNeedsInit = true; private boolean mNeedsInit = true;
private Context mContext; private Context mContext;
private Tracker mTracker; private Tracker mTracker;
public static AnalyticsManager getInstance() {
return INSTANCE;
}
public void init(Context context) { public void init(Context context) {
if (LOCAL_LOGV) Log.v(TAG, "init called. mNeedsInit: " + mNeedsInit); if (LOCAL_LOGV) Log.v(TAG, "init called. mNeedsInit: " + mNeedsInit);