Merge Sage changes for build

.gitignore

@@ -13,3 +13,4 @@ local.properties
 .classpath
 .vscode/
 NDK_14b/
+.cxx/

app/build.gradle

@@ -9,14 +9,15 @@ 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(
@@ -33,6 +34,7 @@ android {
     defaultConfig {
         applicationId 'com.menny.android.anysoftkeyboard'
         minSdkVersion 19
+        multiDexEnabled true
         versionCode versionData.versionCode
         versionName versionData.versionName
 
@@ -126,23 +128,9 @@ dependencies {
     implementation project(':overlay')
     implementation project(':pixel')
 
-    implementation 'com.github.Sage-Bionetworks.BridgeAndroidSDK:android-sdk:02dfcdb', {
-        exclude group: 'joda-time', module: 'joda-time'
+    implementation('org.sagebionetworks.bridge:android-sdk:0.2.0') {
+        exclude group: 'com.google.code.findbugs'
     }
-    implementation 'org.sagebionetworks.bridge:rest-client:0.16.14', {
-        exclude group: 'joda-time', module: 'joda-time'
-    }
-    implementation 'org.sagebionetworks:BridgeDataUploadUtils:0.2.6', {
-        exclude group: 'joda-time', module: 'joda-time'
-    }
-
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.14.1'
-    implementation 'io.reactivex:rxjava:1.3.8'
-    api 'net.danlew:android.joda:2.9.9.4'
-
-    implementation 'com.android.support:multidex:1.0.3'
-    api "com.google.dagger:dagger-android:2.21"
-    api "com.google.dagger:dagger-android-support:2.21"
 
     implementation "com.anysoftkeyboard.api:api:$AnySoftKeyboardApiVersion"
     implementation "com.android.support:support-fragment:$supportLibVersion"

app/src/main/java/com/menny/android/anysoftkeyboard/BiAffect/bridge/BiAffectBridge.java

@@ -1,11 +1,21 @@
 package com.menny.android.anysoftkeyboard.BiAffect.bridge;
 
 import android.text.TextUtils;
+import android.util.Log;
 
+import com.google.gson.Gson;
+
+import org.joda.time.DateTime;
+import org.sagebionetworks.bridge.android.BridgeConfig;
 import org.sagebionetworks.bridge.android.manager.BridgeManagerProvider;
+import org.sagebionetworks.bridge.data.Archive;
+import org.sagebionetworks.bridge.data.JsonArchiveFile;
 import org.sagebionetworks.bridge.rest.model.UserSessionInfo;
 
+import java.util.Locale;
+
 import rx.Single;
+import rx.functions.Action0;
 
 /**
  * Utility class to help manage the connection between BiAffect data and the Sage Bridge SDK
@@ -63,4 +73,39 @@ public Single<UserSessionInfo> logIn( String email, String password ) {
         return BridgeManagerProvider.getInstance().getAuthenticationManager().signIn( email, password );
     }
 
+
+    public void upload() {
+        String json = new Gson().toJson( new Session() );
+
+
+        //this is found in upload schemas under upload&export
+        // TODO: 8/15/2019 Figure out what exactly the endDate is.
+        JsonArchiveFile file = new JsonArchiveFile("Session.json", DateTime.now(), json);
+        Archive.Builder builder = Archive.Builder.forActivity( "KeyboardSession" );
+        builder.addDataFile( file );
+
+        BridgeConfig config = BridgeManagerProvider.getInstance().getBridgeConfig();
+        String appVersionString = String.format(Locale.ENGLISH, "version %s, build %d",
+                config.getAppVersionName(),
+                config.getAppVersion());
+        builder.withAppVersionName(appVersionString);
+        builder.withPhoneInfo(config.getDeviceName());
+        Archive archive = builder.build();
+
+        BridgeManagerProvider.getInstance().getUploadManager().queueUpload( "UUID filename", archive ).subscribe( success -> {
+            BridgeManagerProvider.getInstance().getUploadManager().processUploadFiles().subscribe(new Action0() {
+                @Override
+                public void call() {
+                    Log.wtf("asf", "i'm complete??");
+                }
+            }, error -> {
+                Log.wtf( "asdf", error);
+            });
+        }, error -> {
+            Log.wtf("asdf", error.getMessage());
+        });
+
+        //Call this only when ready to upload files (maybe with work manager)
+    }
+
 }

app/src/main/java/com/menny/android/anysoftkeyboard/BiAffect/bridge/Session.java

@@ -0,0 +1,50 @@
+package com.menny.android.anysoftkeyboard.BiAffect.bridge;
+
+import org.joda.time.DateTime;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Session {
+    private double duration;
+    private DateTime timestamp;
+    private List<Keylogs> keylogs;
+    private List<Accelerations> accelerations;
+
+    public Session() {
+        duration = 2.3;
+        timestamp = DateTime.now();
+
+        keylogs = new ArrayList<>();
+        keylogs.add(new Keylogs());
+
+        accelerations = new ArrayList<>();
+        accelerations.add(new Accelerations());
+    }
+
+    private static class Keylogs {
+        private DateTime timestamp;
+        private String value;
+        private double duration;
+        private double distanceFromCenter;
+
+        private Keylogs() {
+            timestamp = DateTime.now();
+            value = "test";
+            duration = 0.83;
+            distanceFromCenter = 3.2;
+        }
+    }
+
+    private static class Accelerations {
+        private double x;
+        private double y;
+        private double z;
+
+        private Accelerations() {
+            x = 0.33289;
+            y = -0.9381;
+            z = 0.319742;
+        }
+    }
+}

build.gradle

@@ -11,7 +11,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath 'com.github.triplet.gradle:play-publisher:2.0.0'
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.6.1'
     }
@@ -26,6 +26,7 @@ allprojects {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         maven { url "https://jitpack.io" }
         maven { url 'http://repo-maven.sagebridge.org/' }
+        maven { url 'https://dl.bintray.com/sage-bionetworks/bridge-maven-release' }
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip