Merge pull request #174 from Allsimon/remove-nonfree-libs

Create a free flavor for F-Droid
This commit is contained in:
Moez Bhatti
2015-08-25 22:17:21 -04:00
9 changed files with 107 additions and 38 deletions
@@ -31,7 +31,6 @@ import android.util.Log;
import com.android.mms.transaction.MmsSystemEventReceiver;
import com.android.mms.util.DownloadManager;
import com.android.mms.util.RateController;
import com.crittercism.app.Crittercism;
import com.moez.QKSMS.common.AnalyticsManager;
import com.moez.QKSMS.common.LiveViewManager;
import com.moez.QKSMS.common.google.DraftCache;
@@ -46,13 +45,13 @@ import com.squareup.leakcanary.RefWatcher;
import java.util.Locale;
public class QKSMSApp extends Application {
public class QKSMSAppBase extends Application {
public static final String LOG_TAG = "Mms";
private SearchRecentSuggestions mRecentSuggestions;
private TelephonyManager mTelephonyManager;
private String mCountryIso;
private static QKSMSApp sQKSMSApp = null;
private static QKSMSAppBase sQKSMSApp = null;
private PduLoaderManager mPduLoaderManager;
private ThumbnailManager mThumbnailManager;
private DrmManagerClient mDrmManagerClient;
@@ -77,7 +76,6 @@ public class QKSMSApp extends Application {
// Initialize analytics, leakcanary, and crittercism
AnalyticsManager.getInstance().init(this);
refWatcher = LeakCanary.install(this);
Crittercism.initialize(getApplicationContext(), getString(R.string.crtsm_key));
// Figure out the country *before* loading contacts and formatting numbers
Country country = new Country(Locale.getDefault().getCountry(), Country.COUNTRY_SOURCE_LOCALE);
@@ -102,7 +100,7 @@ public class QKSMSApp extends Application {
}
public static RefWatcher getRefWatcher(Context context) {
QKSMSApp application = (QKSMSApp) context.getApplicationContext();
QKSMSAppBase application = (QKSMSAppBase) context.getApplicationContext();
return application.refWatcher;
}
@@ -124,7 +122,7 @@ public class QKSMSApp extends Application {
//sendBroadcast(new Intent(SmsReceiverService.ACTION_SEND_INACTIVE_MESSAGE, null, this, SmsReceiver.class));
}
synchronized public static QKSMSApp getApplication() {
synchronized public static QKSMSAppBase getApplication() {
return sQKSMSApp;
}
@@ -155,7 +153,7 @@ public class QKSMSApp extends Application {
*/
public TelephonyManager getTelephonyManager() {
if (mTelephonyManager == null) {
mTelephonyManager = (TelephonyManager)getApplicationContext()
mTelephonyManager = (TelephonyManager) getApplicationContext()
.getSystemService(Context.TELEPHONY_SERVICE);
}
return mTelephonyManager;
@@ -1,77 +0,0 @@
package com.moez.QKSMS.common;
import android.content.Context;
import android.util.Log;
import com.google.android.gms.analytics.GoogleAnalytics;
import com.google.android.gms.analytics.HitBuilders;
import com.google.android.gms.analytics.Tracker;
import com.moez.QKSMS.R;
public enum AnalyticsManager {
INSTANCE;
private final static String TAG = "AnalyticsManager";
private final static boolean LOCAL_LOGV = false;
/**
* Event categories
*/
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 Context mContext;
private Tracker mTracker;
public static AnalyticsManager getInstance() {
return INSTANCE;
}
public void init(Context context) {
if (LOCAL_LOGV) Log.v(TAG, "init called. mNeedsInit: " + mNeedsInit);
if (mNeedsInit) {
mNeedsInit = false;
mContext = context;
// Initialize tracker
GoogleAnalytics analytics = GoogleAnalytics.getInstance(mContext);
mTracker = analytics.newTracker(R.xml.google_analytics_tracker);
}
}
public void sendEvent(String category, String action, String label) {
if (LOCAL_LOGV) Log.v(TAG, "sendEvent category:" + category + ", action:" + action +
", label:" + label);
HitBuilders.EventBuilder b = new HitBuilders.EventBuilder();
if (category != null) b.setCategory(category);
if (action != null) b.setAction(action);
if (label != null) b.setLabel(label);
mTracker.send(b.build());
}
public void sendEvent(String category, String action, String label, long value) {
if (LOCAL_LOGV) Log.v(TAG, "sendEvent category:" + category + ", action:" + action +
", label:" + label + ", value:" + value);
HitBuilders.EventBuilder b = new HitBuilders.EventBuilder();
if (category != null) b.setCategory(category);
if (action != null) b.setAction(action);
if (label != null) b.setLabel(label);
b.setValue(value);
mTracker.send(b.build());
}
}
@@ -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.google.android.mms.pdu_alt.PduHeaders;
import com.moez.QKSMS.QKSMSAppBase;
import com.moez.QKSMS.mmssms.Utils;
import com.moez.QKSMS.LogTag;
import com.moez.QKSMS.QKSMSApp;
@@ -802,7 +803,7 @@ public class Conversation {
sDeletingThreads = true;
String selection = deleteAll ? null : "locked=0";
QKSMSApp app = QKSMSApp.getApplication();
QKSMSAppBase app = QKSMSApp.getApplication();
//app.getPduLoaderManager().clear();
//app.getThumbnailManager().clear();
@@ -624,7 +624,7 @@ public class ThemeManager {
public static void setColour(int color) {
AnalyticsManager.INSTANCE.sendEvent(
AnalyticsManager.getInstance().sendEvent(
AnalyticsManager.CATEGORY_PREFERENCE_CHANGE,
SettingsFragment.CATEGORY_THEME,
getColorString(color)