Comparing changes made by BiAffect to original code in March 2019

.gitignore

@@ -11,4 +11,6 @@ local.properties
 .project
 .settings/
 .classpath
-.vscode/
+.vscode/
+NDK_14b/
+.cxx/

app/build.gradle

@@ -9,18 +9,20 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.github.menny:GradleVersion:0.0.3'
+        classpath 'net.evendanan.autoversion:gradle-plugin:0.1.7'
+//        classpath 'com.github.menny:GradleVersion:0.0.3'
+        //classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
 apply plugin: 'com.android.application'
 apply plugin: 'com.github.triplet.play'
-apply plugin: 'net.evendanan.versiongenerator'
+apply plugin: 'net.evendanan.autoversion'
 
 def generators = [
         new net.evendanan.versiongenerator.generators.EnvBuildVersionGenerator.CircleCi(
                 1650/*adding to version. Should not ever change*/,
-                -2575-2600 /*decrementing due to minor, every minor/major bump, this should be decremented*/),
+                -2575 - 2600 /*decrementing due to minor, every minor/major bump, this should be decremented*/),
         new net.evendanan.versiongenerator.generators.StaticVersionGenerator()
 ]
 
@@ -31,6 +33,8 @@ apply from: "${rootDir}/gradle/android_general.gradle"
 android {
     defaultConfig {
         applicationId 'com.menny.android.anysoftkeyboard'
+        minSdkVersion 19
+        multiDexEnabled true
         versionCode versionData.versionCode
         versionName versionData.versionName
 
@@ -86,6 +90,11 @@ android {
             matchingFallbacks = ['release', 'debug']
         }
     }
+    sourceSets {
+        main {
+            java.srcDirs = ['src/main/java', 'src/main/java/com/menny/android/anysoftkeyboard/DAO_DB']
+        }
+    }
 }
 
 play {
@@ -104,7 +113,7 @@ if (playStoreWhatsNewFile.text.length() > 500) {
     println("Locale " + Locale.getDefault())
     println("file encoding " + CharsetToolkit.defaultSystemCharset)
     println("File contents:")
-    println("***" +  playStoreWhatsNewFile.text + "***")
+    println("***" + playStoreWhatsNewFile.text + "***")
     throw new IllegalStateException("whatsnew file can not be longer than 500 characters! Currently " + playStoreWhatsNewFile.text.length())
 }
 
@@ -119,6 +128,21 @@ dependencies {
     implementation project(':overlay')
     implementation project(':pixel')
 
+    implementation('org.sagebionetworks.bridge:android-sdk:0.2.0') {
+        exclude group: 'com.google.code.findbugs'
+    }
+
+    //https://developer.android.com/jetpack/androidx/releases/work#declaring_dependencies
+    def work_version = "1.0.1"
+    implementation("android.arch.work:work-runtime:$work_version") {
+        exclude group: 'com.google.guava', module: 'listenablefuture'
+    }
+    implementation("android.arch.work:work-rxjava2:$work_version") {
+        exclude group: 'com.google.guava', module: 'listenablefuture'
+    }
+
+    implementation 'com.github.akarnokd:rxjava2-interop:0.13.2'
+
     implementation "com.anysoftkeyboard.api:api:$AnySoftKeyboardApiVersion"
     implementation "com.android.support:support-fragment:$supportLibVersion"
     implementation "com.android.support:appcompat-v7:$supportLibVersion"
@@ -138,6 +162,45 @@ dependencies {
     implementation 'com.anysoftkeybaord.languages:base:4.0.368@aar'
     implementation 'com.anysoftkeybaord.languages.english:english:4.0.368@aar'
 
+    implementation 'com.android.support:support-annotations:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'android.arch.lifecycle:extensions:1.1.1'
     testImplementation project(path: ':base-test')
     testImplementation 'com.github.triplet.simpleprovider:simpleprovider:1.1.0'
+
+//    // Room components
+    /*
+    * Room depends on 26.1 of support library, SupportLibrary does not promise interop between versions.
+    * hence code breaking?
+    * Trying to resolve by excluding from group
+    *  */
+    implementation("android.arch.persistence.room:runtime:$rootProject.roomVersion") {
+        exclude group: 'com.android.support'
+    }
+    annotationProcessor "android.arch.persistence.room:compiler:$rootProject.roomVersion"
+//     }
+}
+
+// trying to resolve the android version issues
+//configurations.all {
+//    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+//        def requested = details.requested
+//        if (requested.group == 'com.android.support') {
+//            if (!requested.name.startsWith("multidex")) {
+//                details.useVersion '28.0.0'
+//            }
+//        }
+//    }
+//
+//
+
+configurations.all {
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+        def requested = details.requested
+        if (requested.group == 'com.android.support') {
+            if (!requested.name.startsWith("multidex")) {
+                details.useVersion '25.4.0'
+            }
+        }
+    }
 }

app/src/debug/AndroidManifest.xml

@@ -4,5 +4,7 @@
 
     <application
         android:name="com.anysoftkeyboard.debug.DebugAnyApplication"
-        tools:replace="android:name" />
+        tools:replace="android:name" >
+    </application>
+
 </manifest>

app/src/main/AndroidManifest.xml

@@ -1,34 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.menny.android.anysoftkeyboard">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.menny.android.anysoftkeyboard"> <!-- used in QuickTextViewFactory -->
+    <uses-sdk tools:overrideLibrary="com.astuetz.pagerslidingtabstrip,androidx.test,androidx.test.core" />
 
     <supports-screens
         android:anyDensity="true"
         android:largeScreens="true"
         android:normalScreens="true"
         android:smallScreens="true"
         android:xlargeScreens="true"
-        tools:ignore="UnusedAttribute" />
-    <!-- http://d.android.com/guide/practices/screens_support.html read about legacy. -->
-
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <!-- required for the user dictionary (long press a word in the suggestions bar) -->
+        tools:ignore="UnusedAttribute" /> <!-- http://d.android.com/guide/practices/screens_support.html read about legacy. -->
+    <uses-permission android:name="android.permission.VIBRATE" /> <!-- required for the user dictionary (long press a word in the suggestions bar) -->
     <uses-permission android:name="android.permission.READ_USER_DICTIONARY" />
-    <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" />
-    <!-- REQUIRED FOR THE CONTACTS DICTIONARY -->
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <!-- REQUIRED BACKUP TO/RESTORE FROM SDCARD -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <!-- currently, only support touch and fake-touch devices -->
+    <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" /> <!-- REQUIRED FOR THE CONTACTS DICTIONARY -->
+    <uses-permission android:name="android.permission.READ_CONTACTS" /> <!-- REQUIRED BACKUP TO/RESTORE FROM SDCARD -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- currently, only support touch and fake-touch devices -->
     <uses-feature android:name="android.hardware.faketouch" />
     <uses-feature
         android:name="android.hardware.touchscreen"
         android:required="false" />
 
-    <!-- used in QuickTextViewFactory -->
-    <uses-sdk tools:overrideLibrary="com.astuetz.pagerslidingtabstrip,androidx.test,androidx.test.core" />
-
     <application
         android:name=".AnyApplication"
         android:hardwareAccelerated="true"
@@ -38,15 +30,41 @@
         android:restoreAnyVersion="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/Theme.AskApp"
-        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
+        tools:replace="android:label">
+        <activity
+            android:name="com.anysoftkeyboard.ui.settings.setup.ConsentPage"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/ime_name"
+            android:launchMode="singleTop"
+            android:roundIcon="@mipmap/ic_launcher_round"
+            android:theme="@style/Theme.AskApp.NoTitle.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-        <!-- used to backup the settings and SQL to the cloud -->
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.anysoftkeyboard.ui.settings.setup.LoggingPage"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/ime_name"
+            android:launchMode="singleTask"
+            android:roundIcon="@mipmap/ic_launcher_round"
+            android:theme="@style/Theme.AskApp.NoTitle.NoActionBar">
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.MAIN" />-->
+
+                <!--<category android:name="android.intent.category.LAUNCHER" />-->
+            <!--</intent-filter>-->
+        </activity> <!-- <activity -->
+        <!-- android:name="ui.settings.setup.LoggingPage" -->
+        <!-- android:label="@string/title_activity_login" /> &lt;!&ndash; used to backup the settings and SQL to the cloud &ndash;&gt; -->
         <!--
         <meta-data
             android:name="com.google.android.backup.api_key"
             android:value="AEdPqrEAAAAILlrSpiqigog3iJt3BwYxzNXMUzqgGV_dJ1EPDQ"/>
         -->
-
         <!-- this is the IME with the pointer to the settings ui (xml/method) -->
         <service
             android:name=".SoftKeyboard"
@@ -58,24 +76,28 @@
             <meta-data
                 android:name="android.view.im"
                 android:resource="@xml/method" />
-        </service>
-
-        <!-- ui activities -->
+        </service> <!-- ui activities -->
         <!-- settings ui activities -->
-        <!-- this is just a proxy activity, it does nothing but direct to the actual setting ativity
-        I use this, so I can 'disable' this activity at runtime, and so remove ASK from the launcher's icons -->
+        <!--
+ this is just a proxy activity, it does nothing but direct to the actual setting ativity
+        I use this, so I can 'disable' this activity at runtime, and so remove ASK from the launcher's icons
+        -->
+        <!-- android:launchMode="singleTop" -->
         <activity
-            android:name="com.menny.android.anysoftkeyboard.LauncherSettingsActivity"
+            android:name=".LauncherSettingsActivity"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/ime_name"
-            android:launchMode="singleTop"
+            android:launchMode="singleTask"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:theme="@style/Theme.AskApp">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.MAIN" /> -->
+
+
+            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+            <!-- </intent-filter> -->
+
             <meta-data
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
@@ -96,23 +118,20 @@
             android:roundIcon="@mipmap/ic_launcher_round"
             android:theme="@style/Theme.AskApp.NoTitle.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
-
         <activity
             android:name="com.anysoftkeyboard.ui.tutorials.TestersNoticeActivity"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/testers_version"
             android:launchMode="singleTop"
             android:noHistory="true"
             android:roundIcon="@mipmap/ic_launcher_round"
-            android:theme="@style/Theme.AskApp.Popup" />
-        <!-- ui when a crash happens -->
+            android:theme="@style/Theme.AskApp.Popup" /> <!-- ui when a crash happens -->
         <activity
             android:name="com.anysoftkeyboard.ui.SendBugReportUiActivity"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/ime_name"
             android:roundIcon="@mipmap/ic_launcher_round"
-            android:theme="@style/Theme.AskApp.NoTitle" />
-        <!-- for voice -->
+            android:theme="@style/Theme.AskApp.NoTitle" /> <!-- for voice -->
         <service android:name="com.google.android.voiceime.ServiceHelper" />
 
         <activity
@@ -133,4 +152,4 @@
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
     </application>
 
-</manifest>
+</manifest>