Release 1.6.1

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.indywidualni.fblite"
         minSdkVersion 14
         targetSdkVersion 22
-        versionCode 7
-        versionName "1.6.0"
+        versionCode 8
+        versionName "1.6.1"
     }
     buildTypes {
         release {
@@ -23,5 +23,4 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:support-v4:22.1.1'
     compile 'com.android.support:appcompat-v7:22.1.1'
-    compile 'com.google.android.gms:play-services-analytics:7.3.0'
 }

app/manifest-merger-release-report.txt

@@ -19,9 +19,6 @@ uses-sdk
 ADDED from AndroidManifest.xml:7:5
 MERGED from com.android.support:support-v4:22.1.1:20:5
 MERGED from com.android.support:appcompat-v7:22.1.1:20:5
-MERGED from com.android.support:support-v4:22.1.1:20:5
-MERGED from com.google.android.gms:play-services-analytics:7.3.0:18:5
-MERGED from com.google.android.gms:play-services-base:7.3.0:18:5
 MERGED from com.android.support:support-v4:22.1.1:20:5
 	android:targetSdkVersion
 		ADDED from AndroidManifest.xml:9:9
@@ -47,9 +44,6 @@ application
 ADDED from AndroidManifest.xml:15:5
 MERGED from com.android.support:support-v4:22.1.1:22:5
 MERGED from com.android.support:appcompat-v7:22.1.1:22:5
-MERGED from com.android.support:support-v4:22.1.1:22:5
-MERGED from com.google.android.gms:play-services-analytics:7.3.0:19:5
-MERGED from com.google.android.gms:play-services-base:7.3.0:20:5
 MERGED from com.android.support:support-v4:22.1.1:22:5
 	android:label
 		ADDED from AndroidManifest.xml:20:9
@@ -63,82 +57,69 @@ MERGED from com.android.support:support-v4:22.1.1:22:5
 		ADDED from AndroidManifest.xml:21:9
 	android:name
 		ADDED from AndroidManifest.xml:16:9
-meta-data#com.google.android.gms.version
-ADDED from AndroidManifest.xml:23:9
-MERGED from com.google.android.gms:play-services-base:7.3.0:21:9
-	android:value
-		ADDED from AndroidManifest.xml:25:13
-	android:name
-		ADDED from AndroidManifest.xml:24:13
-meta-data#com.google.android.gms.analytics.globalConfigResource
-ADDED from AndroidManifest.xml:26:9
-	android:resource
-		ADDED from AndroidManifest.xml:28:13
-	android:name
-		ADDED from AndroidManifest.xml:27:13
 activity#org.indywidualni.fblite.MainActivity
-ADDED from AndroidManifest.xml:30:9
+ADDED from AndroidManifest.xml:22:9
 	android:label
-		ADDED from AndroidManifest.xml:32:13
+		ADDED from AndroidManifest.xml:24:13
 	android:launchMode
-		ADDED from AndroidManifest.xml:34:13
+		ADDED from AndroidManifest.xml:26:13
 	android:configChanges
-		ADDED from AndroidManifest.xml:33:13
+		ADDED from AndroidManifest.xml:25:13
 	android:name
-		ADDED from AndroidManifest.xml:31:13
+		ADDED from AndroidManifest.xml:23:13
 intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:35:13
+ADDED from AndroidManifest.xml:27:13
 action#android.intent.action.MAIN
-ADDED from AndroidManifest.xml:36:17
+ADDED from AndroidManifest.xml:28:17
 	android:name
-		ADDED from AndroidManifest.xml:36:25
+		ADDED from AndroidManifest.xml:28:25
 category#android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:37:17
+ADDED from AndroidManifest.xml:29:17
 	android:name
-		ADDED from AndroidManifest.xml:37:27
+		ADDED from AndroidManifest.xml:29:27
 intent-filter#android.intent.action.VIEW+android.intent.category.BROWSABLE+android.intent.category.DEFAULT
-ADDED from AndroidManifest.xml:39:13
+ADDED from AndroidManifest.xml:31:13
 category#android.intent.category.DEFAULT
-ADDED from AndroidManifest.xml:40:17
+ADDED from AndroidManifest.xml:32:17
 	android:name
-		ADDED from AndroidManifest.xml:40:27
+		ADDED from AndroidManifest.xml:32:27
 category#android.intent.category.BROWSABLE
-ADDED from AndroidManifest.xml:41:17
+ADDED from AndroidManifest.xml:33:17
 	android:name
-		ADDED from AndroidManifest.xml:41:27
+		ADDED from AndroidManifest.xml:33:27
 action#android.intent.action.VIEW
-ADDED from AndroidManifest.xml:42:17
+ADDED from AndroidManifest.xml:34:17
 	android:name
-		ADDED from AndroidManifest.xml:42:25
+		ADDED from AndroidManifest.xml:34:25
 data
-ADDED from AndroidManifest.xml:43:17
+ADDED from AndroidManifest.xml:35:17
 	android:host
-		ADDED from AndroidManifest.xml:43:23
+		ADDED from AndroidManifest.xml:35:23
 	android:scheme
-		ADDED from AndroidManifest.xml:43:51
+		ADDED from AndroidManifest.xml:35:51
 activity#org.indywidualni.fblite.SettingsActivity
-ADDED from AndroidManifest.xml:51:9
+ADDED from AndroidManifest.xml:43:9
 	android:label
-		ADDED from AndroidManifest.xml:53:13
+		ADDED from AndroidManifest.xml:45:13
 	android:parentActivityName
-		ADDED from AndroidManifest.xml:54:13
+		ADDED from AndroidManifest.xml:46:13
 	android:theme
-		ADDED from AndroidManifest.xml:55:13
+		ADDED from AndroidManifest.xml:47:13
 	android:name
-		ADDED from AndroidManifest.xml:52:13
+		ADDED from AndroidManifest.xml:44:13
 meta-data#android.support.PARENT_ACTIVITY
-ADDED from AndroidManifest.xml:56:13
+ADDED from AndroidManifest.xml:48:13
 	android:value
-		ADDED from AndroidManifest.xml:58:17
+		ADDED from AndroidManifest.xml:50:17
 	android:name
-		ADDED from AndroidManifest.xml:57:17
+		ADDED from AndroidManifest.xml:49:17
 activity#org.indywidualni.fblite.AboutActivity
-ADDED from AndroidManifest.xml:60:9
+ADDED from AndroidManifest.xml:52:9
 	android:label
-		ADDED from AndroidManifest.xml:62:13
+		ADDED from AndroidManifest.xml:54:13
 	android:parentActivityName
-		ADDED from AndroidManifest.xml:63:13
+		ADDED from AndroidManifest.xml:55:13
 	android:theme
-		ADDED from AndroidManifest.xml:64:13
+		ADDED from AndroidManifest.xml:56:13
 	android:name
-		ADDED from AndroidManifest.xml:61:13
+		ADDED from AndroidManifest.xml:53:13

app/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.indywidualni.fblite"
-    android:versionCode="7"
-    android:versionName="1.6.0" >
+    android:versionCode="8"
+    android:versionName="1.6.1" >
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -19,14 +19,6 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/Theme.AppCompat.Light.NoActionBar" >
-
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
-        <meta-data
-            android:name="com.google.android.gms.analytics.globalConfigResource"
-            android:resource="@xml/global_tracker" />
-
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"

app/src/main/java/org/indywidualni/fblite/MainActivity.java

@@ -36,7 +36,6 @@
 import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.Toast;
-import com.google.android.gms.analytics.GoogleAnalytics;
 
 public class MainActivity extends Activity {
 
@@ -72,14 +71,6 @@ protected void onCreate(Bundle savedInstanceState) {
         // get shared preferences
         preferences = PreferenceManager.getDefaultSharedPreferences(this);
 
-        /**
-         * get a Google Analytics Tracker (should auto-report)
-         * don't do it when Facebook zero is enabled and it's active
-         * otherwise someone could be charged and it's not ok
-         */
-        if (!preferences.getBoolean("facebook_zero", false) || !Connectivity.isConnectedMobile(getApplicationContext()))
-            ((MyApplication) getApplication()).getTracker(MyApplication.TrackerName.APP_TRACKER);
-
         // if the app is being launched for the first time
         if (preferences.getBoolean("first_run", true)) {
             // show quick start guide
@@ -545,20 +536,6 @@ private void selectItem(int position) {
         mDrawerLayout.closeDrawer(mDrawerList);
     }
 
-    // application start
-    @Override
-    protected void onStart() {
-        super.onStart();
-        GoogleAnalytics.getInstance(this).reportActivityStart(this);
-    }
-
-    // application stop
-    @Override
-    protected void onStop() {
-        super.onStop();
-        GoogleAnalytics.getInstance(this).reportActivityStop(this);
-    }
-
     // survive screen orientation change
     @Override
     public void onConfigurationChanged(Configuration newConfig) {

app/src/main/java/org/indywidualni/fblite/MyApplication.java

@@ -2,9 +2,6 @@
 
 import android.app.Application;
 import android.content.Context;
-import com.google.android.gms.analytics.GoogleAnalytics;
-import com.google.android.gms.analytics.Tracker;
-import java.util.HashMap;
 
 public class MyApplication extends Application {
 
@@ -22,41 +19,4 @@ public static Context getContextOfApplication() {
         return mContext;
     }
 
-    // The following line should be changed to include the correct property id.
-    private static final String PROPERTY_ID = "UA-614697-28";
-
-    public static int GENERAL_TRACKER = 0;
-
-    /**
-     * Enum used to identify the tracker that needs to be used for tracking.
-     *
-     * A single tracker is usually enough for most purposes. In case you do need multiple trackers,
-     * storing them all in Application object helps ensure that they are created only once per
-     * application instance.
-     */
-    public enum TrackerName {
-        APP_TRACKER, // Tracker used only in this app.
-        GLOBAL_TRACKER, // Tracker used by all the apps from a company. eg: roll-up tracking.
-        ECOMMERCE_TRACKER, // Tracker used by all ecommerce transactions from a company.
-    }
-
-    HashMap<TrackerName, Tracker> mTrackers = new HashMap<TrackerName, Tracker>();
-
-    public MyApplication() {
-        super();
-    }
-
-    synchronized Tracker getTracker(TrackerName trackerId) {
-        if (!mTrackers.containsKey(trackerId)) {
-
-            GoogleAnalytics analytics = GoogleAnalytics.getInstance(this);
-            Tracker t = (trackerId == TrackerName.APP_TRACKER) ? analytics.newTracker(R.xml.app_tracker)
-                    : (trackerId == TrackerName.GLOBAL_TRACKER) ? analytics.newTracker(PROPERTY_ID)
-                    : analytics.newTracker(R.xml.ecommerce_tracker);
-            mTrackers.put(trackerId, t);
-
-        }
-        return mTrackers.get(trackerId);
-    }
-
 }