Removing Crashlytics #1469

11 files changed, 6 insertions, 221 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 92a086dc9..a5b9d937f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,20 +3,17 @@ group 'net.evendanan'
 buildscript {
     repositories {
         google()
-        maven { url 'https://maven.fabric.io/public' }
         maven { url 'https://jitpack.io' }
         maven { url "https://plugins.gradle.org/m2/" }
         mavenCentral()
     }
 
     dependencies {
-        classpath 'io.fabric.tools:gradle:1.25.4'
         classpath 'com.github.menny:GradleVersion:0.0.3'
     }
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'io.fabric'
 apply plugin: 'com.github.triplet.play'
 apply plugin: 'net.evendanan.versiongenerator'
 
@@ -28,10 +25,6 @@ def generators = [
 
 def versionData = versionGenerator.generateVersion(1, 9, 0, generators)
 
-repositories {
-    maven { url 'https://maven.fabric.io/public' }
-}
-
 android {
     packagingOptions {
         exclude 'LICENSE.txt'
@@ -91,15 +84,12 @@ android {
             minifyEnabled true
             proguardFiles 'proguard-android-optimize.txt', 'proguard-rules.txt'
 
-            ext.enableCrashlytics = false
-
             buildConfigField("boolean", "TESTING_BUILD", "false")
         }
 
         debug {
             testCoverageEnabled true
 
-            ext.enableCrashlytics = false
             buildConfigField("boolean", "TESTING_BUILD", "true")
         }
 
@@ -111,7 +101,6 @@ android {
             minifyEnabled true
             proguardFiles 'proguard-android-optimize.txt', 'proguard-rules.txt'
 
-            ext.enableCrashlytics = true
             buildConfigField("boolean", "TESTING_BUILD", "true")
 
             matchingFallbacks = ['release', 'debug']
@@ -145,6 +134,8 @@ if (!playStoreWhatsNewFile.exists()) {
 if (playStoreWhatsNewFile.text.length() > 500) {
     println("Locale " + Locale.getDefault())
     println("file encoding " + CharsetToolkit.defaultSystemCharset)
+    println("File contents:")
+    println("***" +  playStoreWhatsNewFile.text + "***")
     throw new IllegalStateException("whatsnew file can not be longer than 500 characters! Currently " + playStoreWhatsNewFile.text.length())
 }
 
@@ -175,13 +166,4 @@ dependencies {
     testImplementation project(path: ':base-test')
 
     testImplementation 'com.github.triplet.simpleprovider:simpleprovider:1.1.0'
-
-    canaryImplementation project(path: ':crashlytics')
-}
-
-crashlytics {
-    enableNdk true
-    androidNdkOut "${rootDir.absolutePath}/jnidictionaryv2/build/intermediates/ndkBuild/release/obj/local/"
-    androidNdkLibsOut "${rootDir.absolutePath}/app/build/intermediates/transforms/mergeJniLibs/canary/0/lib/"
-    manifestPath = "${projectDir.absolutePath}/build/intermediates/manifests/full/canary/AndroidManifest.xml"
 }
diff --git a/app/src/canary/AndroidManifest.xml b/app/src/canary/AndroidManifest.xml
index 4ffa8dd97..101247103 100644
--- a/app/src/canary/AndroidManifest.xml
+++ b/app/src/canary/AndroidManifest.xml
@@ -2,14 +2,7 @@
           xmlns:tools="http://schemas.android.com/tools"
           package="com.menny.android.anysoftkeyboard">
 
-    <uses-sdk tools:overrideLibrary="com.anysoftkeyboard.crashlytics,com.crashlytics.android.ndk" />
-
     <application
         android:name="com.anysoftkeyboard.canary.CanaryAnyApplication"
-        tools:replace="android:name">
-
-        <meta-data
-            android:name="io.fabric.ApiKey"
-            android:value="e34140fee128520e40d96052088ef31bd83fc895" />
-    </application>
+        tools:replace="android:name" />
 </manifest>
diff --git a/app/src/canary/java/com/anysoftkeyboard/canary/CanaryAnyApplication.java b/app/src/canary/java/com/anysoftkeyboard/canary/CanaryAnyApplication.java
index 923cfc2ad..7ef7d9214 100644
--- a/app/src/canary/java/com/anysoftkeyboard/canary/CanaryAnyApplication.java
+++ b/app/src/canary/java/com/anysoftkeyboard/canary/CanaryAnyApplication.java
@@ -16,43 +16,8 @@
 
 package com.anysoftkeyboard.canary;
 
-import android.Manifest;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Build;
-
-import com.anysoftkeyboard.crashlytics.NdkCrashlytics;
-import com.anysoftkeyboard.ui.settings.MainSettingsActivity;
 import com.menny.android.anysoftkeyboard.AnyApplication;
 
-import net.evendanan.chauffeur.lib.permissions.PermissionsFragmentChauffeurActivity;
-
 public class CanaryAnyApplication extends AnyApplication {
 
-    private NdkCrashlytics mNdkCrashlytics;
-
-    @Override
-    protected void setupCrashHandler(SharedPreferences sp) {
-        super.setupCrashHandler(sp);
-        if (Build.VERSION.SDK_INT >= NdkCrashlytics.SUPPORTED_MIN_SDK) {
-            mNdkCrashlytics = new NdkCrashlytics(this);
-        }
-    }
-
-    @Override
-    public void onTerminate() {
-        super.onTerminate();
-        if (mNdkCrashlytics != null) {
-            mNdkCrashlytics.destroy();
-        }
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        Intent internetRequired = PermissionsFragmentChauffeurActivity.createIntentToPermissionsRequest(this, MainSettingsActivity.class, CanaryPermissionsRequestCodes.INTERNET.getRequestCode(),
-                Manifest.permission.INTERNET);
-        if (internetRequired != null) startActivity(internetRequired);
-    }
 }
diff --git a/app/src/canary/java/com/anysoftkeyboard/canary/CanaryPermissionsRequestCodes.java b/app/src/canary/java/com/anysoftkeyboard/canary/CanaryPermissionsRequestCodes.java
deleted file mode 100644
index ac3bf0853..000000000
--- a/app/src/canary/java/com/anysoftkeyboard/canary/CanaryPermissionsRequestCodes.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.anysoftkeyboard.canary;
-
-import com.anysoftkeyboard.PermissionsRequestCodes;
-
-public enum CanaryPermissionsRequestCodes {
-    INTERNET;
-
-    public int getRequestCode() {
-        return ordinal() + PermissionsRequestCodes.LAST_ENTRY.getRequestCode();
-    }
-}
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
index 208e4bbd7..189b19b15 100644
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -4,7 +4,5 @@
 
     <application
         android:name="com.anysoftkeyboard.debug.DebugAnyApplication"
-        tools:replace="android:name">
-
-    </application>
+        tools:replace="android:name" />
 </manifest>
diff --git a/crashlytics/build.gradle b/crashlytics/build.gradle
deleted file mode 100644
index aed456fc7..000000000
--- a/crashlytics/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion sdkCompileVersion
-    buildToolsVersion androidBuildTools
-
-    defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion sdkTargetVersion
-        versionCode 1
-        versionName "1.0"
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    lintOptions {
-        lintConfig file("${rootDir}/configs/lint.xml")
-    }
-}
-
-dependencies {
-    implementation project(path: ':base')
-    implementation('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') {
-        transitive = true
-    }
-    implementation('com.crashlytics.sdk.android:crashlytics-ndk:2.0.2@aar') {
-        transitive = true
-    }
-}
diff --git a/crashlytics/src/main/AndroidManifest.xml b/crashlytics/src/main/AndroidManifest.xml
deleted file mode 100644
index c6d12b743..000000000
--- a/crashlytics/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.anysoftkeyboard.crashlytics">
-    <!-- internet is required for Crashlytics -->
-    <uses-permission android:name="android.permission.INTERNET" />
-</manifest>
diff --git a/crashlytics/src/main/java/com/anysoftkeyboard/crashlytics/CrashlyticsLogProvider.java b/crashlytics/src/main/java/com/anysoftkeyboard/crashlytics/CrashlyticsLogProvider.java
deleted file mode 100644
index dbfce0ee8..000000000
--- a/crashlytics/src/main/java/com/anysoftkeyboard/crashlytics/CrashlyticsLogProvider.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.anysoftkeyboard.crashlytics;
-
-import com.anysoftkeyboard.base.utils.LogProvider;
-import com.crashlytics.android.Crashlytics;
-
-public class CrashlyticsLogProvider implements LogProvider {
-    @Override
-    public boolean supportsV() {
-        return true;
-    }
-
-    @Override
-    public void v(final String tag, String text) {
-        Crashlytics.log(1, tag, text);
-    }
-
-    @Override
-    public boolean supportsD() {
-        return true;
-    }
-
-    @Override
-    public void d(final String tag, String text) {
-        Crashlytics.log(2, tag, text);
-    }
-
-    @Override
-    public boolean supportsI() {
-        return true;
-    }
-
-    @Override
-    public void i(final String tag, String text) {
-        Crashlytics.log(3, tag, text);
-    }
-
-    @Override
-    public boolean supportsW() {
-        return true;
-    }
-
-    @Override
-    public void w(final String tag, String text) {
-        Crashlytics.log(4, tag, text);
-    }
-
-    @Override
-    public boolean supportsE() {
-        return true;
-    }
-
-    @Override
-    public void e(final String tag, String text) {
-        Crashlytics.log(5, tag, text);
-    }
-
-    @Override
-    public boolean supportsWTF() {
-        return true;
-    }
-
-    @Override
-    public void wtf(final String tag, String text) {
-        Crashlytics.log(6, tag, text);
-    }
-
-    @Override
-    public boolean supportsYell() {
-        return true;
-    }
-
-    @Override
-    public void yell(final String tag, String text) {
-        Crashlytics.log(6, tag, text);
-    }
-}
diff --git a/crashlytics/src/main/java/com/anysoftkeyboard/crashlytics/NdkCrashlytics.java b/crashlytics/src/main/java/com/anysoftkeyboard/crashlytics/NdkCrashlytics.java
deleted file mode 100644
index 05b188be9..000000000
--- a/crashlytics/src/main/java/com/anysoftkeyboard/crashlytics/NdkCrashlytics.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.anysoftkeyboard.crashlytics;
-
-import android.annotation.TargetApi;
-import android.app.Application;
-import android.os.Build;
-
-import com.anysoftkeyboard.base.utils.Logger;
-import com.crashlytics.android.Crashlytics;
-import com.crashlytics.android.ndk.CrashlyticsNdk;
-
-import io.fabric.sdk.android.Fabric;
-
-public class NdkCrashlytics {
-
-    public static final int SUPPORTED_MIN_SDK = Build.VERSION_CODES.ICE_CREAM_SANDWICH;
-
-    @TargetApi(SUPPORTED_MIN_SDK)
-    public NdkCrashlytics(Application application) {
-        Logger.setLogProvider(new CrashlyticsLogProvider());
-        Fabric.with(application, new Crashlytics(), new CrashlyticsNdk());
-        Crashlytics.setString("locale", application.getResources().getConfiguration().locale.toString());
-        Crashlytics.setString("installer-package-name", application.getPackageManager().getInstallerPackageName(application.getPackageName()));
-    }
-
-    public void destroy() {
-    }
-}
diff --git a/scripts/ci/ci_deploy.sh b/scripts/ci/ci_deploy.sh
index 944dbd33a..982e4953c 100755
--- a/scripts/ci/ci_deploy.sh
+++ b/scripts/ci/ci_deploy.sh
@@ -7,9 +7,7 @@ BUILD_TYPE=$4
 
 if [ "${BUILD_TYPE}" == "canary" ]; then
     echo "Deploy build-type CANARY from master."
-    #adding INTERNET note to change-logs
-    echo '* INTERNET permission for BETA builds. Required for crash tracking.' | cat - app/src/main/play/en-US/whatsnew > temp && mv temp app/src/main/play/en-US/whatsnew
-    BUILD_TYPE="-DdeployChannel=alpha assembleCanary publishCanary crashlyticsUploadSymbols"
+    BUILD_TYPE="-DdeployChannel=alpha assembleCanary publishCanary"
 elif [ "${BUILD_TYPE}" == "release" ]; then
     echo "Deploy build-type RELEASE from 'release-branch'."
     BUILD_TYPE="-DdeployChannel=beta assembleRelease publishRelease"
diff --git a/settings.gradle b/settings.gradle
index cabf37d51..5d4e5776b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':base', ':base-rx', ':dictionaries', ':jnidictionaryv1', ':jnidictionaryv2', ':nextword', ':prefs', ':base-test', ':crashlytics', ':pixel'
+include ':app', ':base', ':base-rx', ':dictionaries', ':jnidictionaryv1', ':jnidictionaryv2', ':nextword', ':prefs', ':base-test', ':pixel'