Set up fdroid build flavor which excludes fabric

app/build.gradle

@@ -24,11 +24,21 @@ android {
         manifestPlaceholders = [fabric_key: project.ext.LABCOAT_FABRIC_KEY]
         vectorDrawables.useSupportLibrary = true
     }
+
+    productFlavors {
+        normal {
+        }
+
+        fdroid {
+        }
+    }
+
     buildTypes {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             ext.enableCrashlytics = true
+            shrinkResources true
         }
         debug {
             minifyEnabled false
@@ -81,6 +91,7 @@ dependencies {
     compile 'com.commit451:bypasses:1.0.1'
     compile 'com.github.Commit451:ElasticDragDismissLayout:1.0.4'
     compile 'com.github.Commit451.AdapterLayout:adapterlayout:1.0.3'
+    compile 'com.github.Commit451.AdapterLayout:adapterflowlayout:1.0.3'
     compile 'com.github.Commit451:Easel:1.0.0'
     compile 'com.github.Commit451:Gimbal:2.0.0'
     compile 'com.github.Commit451:Teleprinter:1.0.2'
@@ -97,14 +108,10 @@ dependencies {
     compile 'com.wdullaer:materialdatetimepicker:2.4.0'
     compile 'com.wefika:flowlayout:0.4.1'
     compile 'com.github.novoda:simple-chrome-custom-tabs:0.1.3-rc1'
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.1@aar') {
-        transitive = true;
-    }
-    compile('com.github.afollestad.material-dialogs:core:0.8.6.2@aar') {
-        transitive = true
-    }
-    compile('com.github.afollestad.material-dialogs:commons:0.8.6.2@aar') {
-        transitive = true
+    compile 'com.afollestad.material-dialogs:core:0.8.6.2'
+    compile 'com.afollestad.material-dialogs:commons:0.8.6.2'
+    normalCompile('com.crashlytics.sdk.android:crashlytics:2.6.1@aar') {
+        transitive = true;
     }
 }

app/src/fdroid/java/com/commit451/gitlab/util/FabricUtil.java

+package com.commit451.gitlab.util;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+/**
+ * Does not enable Fabric
+ */
+public class FabricUtil {
+
+    public static void init(@NonNull Context context) {
+        //do nothing
+    }
+}

app/src/main/java/com/commit451/gitlab/App.java

@@ -15,8 +15,7 @@ import com.commit451.gitlab.api.OkHttpClientFactory;
 import com.commit451.gitlab.api.PicassoFactory;
 import com.commit451.gitlab.api.converter.UriTypeConverter;
 import com.commit451.gitlab.model.Account;
-import com.crashlytics.android.Crashlytics;
-import com.crashlytics.android.core.CrashlyticsCore;
+import com.commit451.gitlab.util.FabricUtil;
 import com.novoda.simplechromecustomtabs.SimpleChromeCustomTabs;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.otto.Bus;
@@ -27,7 +26,6 @@ import net.danlew.android.joda.JodaTimeAndroid;
 import java.util.List;
 import java.util.Locale;
-import io.fabric.sdk.android.Fabric;
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 import timber.log.Timber;
@@ -88,10 +86,7 @@ public class App extends Application {
     @VisibleForTesting
     protected void setupCrashReporting() {
-        CrashlyticsCore core = new CrashlyticsCore.Builder()
-                .disabled(BuildConfig.DEBUG)
-                .build();
-        Fabric.with(this, new Crashlytics.Builder().core(core).build());
+        FabricUtil.init(this);
     }
     @VisibleForTesting

app/src/normal/java/com/commit451/gitlab/util/FabricUtil.java

+package com.commit451.gitlab.util;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import com.commit451.gitlab.BuildConfig;
+import com.crashlytics.android.Crashlytics;
+
+import io.fabric.sdk.android.Fabric;
+
+/**
+ * Enables Fabric
+ */
+public class FabricUtil {
+
+    public static void init(@NonNull Context context) {
+        // Start crashlytics if enabled
+        if (!BuildConfig.DEBUG) {
+            Fabric.with(context, new Crashlytics());
+        }
+    }
+}