Merge pull request #27 from comapi/dev

Support for push deep links

Author: MarcinSwierczek

COMAPI/build.gradle

@@ -2,41 +2,29 @@
 
 buildscript {
     repositories {
-        jcenter()
+        google()
         mavenCentral()
         maven {
-            url 'https://maven.google.com/'
-            name 'Google'
+            url "https://plugins.gradle.org/m2/"
         }
     }
     dependencies {
-
-        classpath 'com.android.tools.build:gradle:3.2.1'
-
-        classpath 'com.google.gms:google-services:4.0.1'
-
-        // For test coverage
-        classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3"
-        classpath 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1'
-
-        classpath 'me.tatarka:gradle-retrolambda:3.7.0'
+        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        google()
         mavenCentral()
-        maven {
-            url 'http://clojars.org/repo'
-        }
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}
+
+apply plugin: 'io.github.gradle-nexus.publish-plugin'
+apply from: "${rootDir}/scripts/publish-root.gradle"

COMAPI/foundation/build.gradle

@@ -1,17 +1,12 @@
 apply plugin: 'com.android.library'
-apply from: 'version.gradle'
-apply from: 'code_coverage.gradle'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
-        versionCode 3
-        versionName foundationVersion
-        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+        targetSdkVersion 30
     }
     buildTypes {
         release {
@@ -25,171 +20,55 @@ android {
             testCoverageEnabled = false
         }
     }
-    lintOptions {
-        disable 'InvalidPackage'
-        disable 'AppLinksAutoVerifyError'
-        abortOnError false
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    lintOptions {
+        abortOnError false
+    }
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
     /* testing */
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'junit:junit:4.12'
-    testImplementation 'org.robolectric:robolectric:3.4.2'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.robolectric:robolectric:4.8.1'
     testImplementation 'org.robolectric:shadows-play-services:3.3.2'
     testImplementation 'org.robolectric:shadows-support-v4:3.3.2'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test:rules:1.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test:rules:1.4.0'
     testImplementation 'com.squareup.okhttp3:mockwebserver:3.9.0'
     /* Rx */
-    implementation 'io.reactivex:rxjava:1.3.3'
-    implementation 'io.reactivex:rxandroid:1.2.1'
-    implementation 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
+    compile 'io.reactivex:rxjava:1.3.3'
+    compile 'io.reactivex:rxandroid:1.2.1'
+    compile 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
     /* Network */
-    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.6.0'
+    compile 'com.squareup.retrofit2:retrofit:2.3.0'
+    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.6.0'
 
     /*FCM*/
     //noinspection GradleCompatible warning disabled (seems to be caused by internal firebase-messaging dependencies versioning)
-    implementation 'com.google.firebase:firebase-messaging:17.3.4'
-    implementation 'com.google.android.gms:play-services-base:16.1.0'
+    compile platform('com.google.firebase:firebase-bom:28.4.0')
+    compile 'com.google.firebase:firebase-messaging'
+    compile 'com.google.android.gms:play-services-base:18.0.1'
 
     /*Sockets*/
-    implementation 'com.neovisionaries:nv-websocket-client:2.3'
+    compile 'com.neovisionaries:nv-websocket-client:2.3'
 }
 
-/*
-
-    Generate Maven release files
-    ./gradlew clean build generateRelease
-
-*/
-
-apply plugin: 'signing'
-apply plugin: 'maven'
-
-def groupId = 'com.comapi'
-def artifactId = 'foundation'
-def version = foundationVersion
-def comapiUrl = 'http://www.comapi.com/'
-def localReleaseDest = "${buildDir}/release/${version}"
-
-task androidJavadocs(type: Javadoc, overwrite: true) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    options.links("http://docs.oracle.com/javase/7/docs/api/")
-    options.linksOffline "http://d.android.com/reference","${android.sdkDirectory}/docs/reference"
-    exclude '**/BuildConfig.java'
-    exclude '**/R.java'
-    failOnError = false
-}
-
-task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-    classifier = 'javadoc'
-    from androidJavadocs.destinationDir
+ext {
+    PUBLISH_GROUP_ID = 'com.comapi'
+    PUBLISH_VERSION = '1.4.0'
+    PUBLISH_ARTIFACT_ID = 'foundation'
 }
 
-task androidSourcesJar(type: Jar) {
-    classifier = 'sources'
-    from android.sourceSets.main.java.srcDirs
-}
-
-uploadArchives {
-
-    repositories.mavenDeployer {
-
-        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-        pom.groupId = groupId
-        pom.artifactId = artifactId
-        pom.version = version
-        pom.project {
-
-            packaging 'aar'
-
-            licenses {
-                license {
-                    name 'MIT License'
-                    url 'http://www.opensource.org/licenses/mit-license.php'
-                    distribution 'repo'
-                }
-            }
-            name 'Comapi'
-            description 'Provides the basics of any Comapi integration into your apps. The Comapi Foundation SDK is responsible for handling: registration, control of User and Device registration details, sending and receiving content & data.'
-            url comapiUrl
-
-            developers {
-                developer {
-                    id 'marcinswierczek'
-                    name 'Marcin Swierczek';
-                    email 'sdk@comapi.com';
-                }
-            }
-
-            scm {
-                url 'https://github.com/comapi/comapi-sdk-android'
-                connection 'scm:git:https://github.com/comapi/comapi-sdk-android.git'
-                developerConnection 'scm:git:https://github.com/comapi/comapi-sdk-android.git'
-            }
-        }
-
-        // Add other pom properties here if you want (developer details / licenses)
-        repository(url: "file://${localReleaseDest}")
-    }
-}
-
-/**
- * To avoid conflict with Jcentre autogenerated files
- */
-task removeMavenMetatdata(type: Delete) {
-    delete fileTree(dir: "${localReleaseDest}/com/comapi/foundation", exclude: "${version}")
-}
-
-task zipRelease(type: Zip) {
-    from "${localReleaseDest}"
-    destinationDir buildDir
-    archiveName "${artifactId}-${version}.zip"
-}
-
-task generateRelease << {
-    println "Release ${version} can be found at ${localReleaseDest}/"
-    println "Release ${version} zipped can be found ${buildDir}/release-${version}.zip"
-}
-
-signing {
-    required { isReleaseVersion || hasProperty("teamcity") }
-    sign configurations.archives
-}
-
-if (hasProperty("teamcity")) {
-    gradle.taskGraph.whenReady { taskGraph ->
-        if (taskGraph.allTasks.any { it instanceof Sign }) {
-
-            def id = System.getenv("keyid")
-            def file = System.getenv("secretkeyringfile")
-            def password = System.getenv("donkypassword")
-
-            allprojects { ext."signing.keyId" = id }
-            allprojects { ext."signing.secretKeyRingFile" = file }
-            allprojects { ext."signing.password" = password }
-
-        }
-    }
-}
-
-generateRelease.dependsOn(uploadArchives)
-zipRelease.dependsOn(removeMavenMetatdata)
-generateRelease.dependsOn(zipRelease)
-
-artifacts {
-    archives androidSourcesJar
-    archives androidJavadocsJar
-}
+apply from: "${rootProject.projectDir}/scripts/publish-module.gradle"

COMAPI/foundation/src/androidTest/java/com/comapi/ALoggingTest.java

@@ -21,8 +21,8 @@
 package com.comapi;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import android.test.suitebuilder.annotation.LargeTest;
 
 import com.comapi.internal.log.LogLevelConst;

COMAPI/foundation/src/main/AndroidManifest.xml

@@ -45,6 +45,9 @@
             </intent-filter>
         </receiver>
 
+        <receiver android:name="com.comapi.internal.receivers.NotificationClickReceiver"
+            android:exported="false"/>
+
         <!-- Service to handle Instance ID service token refresh notifications for FCM security. -->
         <service
             android:name="com.comapi.internal.push.IDService"

COMAPI/foundation/src/main/java/com/comapi/APIConfig.java

@@ -20,7 +20,7 @@
 
 package com.comapi;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.comapi.internal.ComapiException;

COMAPI/foundation/src/main/java/com/comapi/BaseClient.java

@@ -24,7 +24,7 @@
 import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Pair;
 
@@ -126,12 +126,7 @@ <E extends BaseClient> Observable<E> initialise(@NonNull final Application appli
         if (state.compareAndSet(GlobalState.NOT_INITIALISED, GlobalState.INITIALISING)) {
 
             return init(application, adapter)
-                    .concatMap(new Func1<Boolean, Observable<SessionData>>() {
-                        @Override
-                        public Observable<SessionData> call(Boolean state) {
-                            return loadSession(state);
-                        }
-                    })
+                    .concatMap((Func1<Boolean, Observable<SessionData>>) this::loadSession)
                     .doOnNext(session -> log.d(session != null ? "Comapi initialised with session profile id : " + session.getProfileId() : "Comapi initialisation with no session."))
                     .doOnError(e -> {
                         if (log != null) {
@@ -144,12 +139,7 @@ public Observable<SessionData> call(Boolean state) {
                                     .doOnNext(sessionComapiResultPair -> log.d("Push token updated"))
                                     .doOnError(throwable -> log.f("Error updating push token", throwable))
                                     .map((Func1<Pair<SessionData, ComapiResult<Void>>, Object>) resultPair -> resultPair.first)
-                                    .onErrorReturn(new Func1<Throwable, SessionData>() {
-                                        @Override
-                                        public SessionData call(Throwable throwable) {
-                                            return session;
-                                        }
-                                    });
+                                    .onErrorReturn((Func1<Throwable, SessionData>) throwable -> session);
                         }
                         return Observable.fromCallable(() -> session);
                     })
@@ -224,6 +214,8 @@ restApi, new Handler(mainLooper),
                 lifecycleListeners.add(socketController.createLifecycleListener());
                 initialiseLifecycleObserver(application);
 
+                pushMgr.setService(service);
+
                 sub.onNext(state.compareAndSet(GlobalState.INITIALISING, GlobalState.INITIALISED));
                 sub.onCompleted();
 

COMAPI/foundation/src/main/java/com/comapi/BaseComapi.java

@@ -38,7 +38,7 @@ class BaseComapi {
     /**
      * Version of the ComapiImpl SDK MAJOR.MINOR.PATCH.BUILD
      */
-    private final static String SDK_VERSION = "1.3.0";
+    private final static String SDK_VERSION = "1.4.0";
 
     private static final Set<String> apiSpaces = Collections.synchronizedSet(new HashSet<String>());
 

COMAPI/foundation/src/main/java/com/comapi/Comapi.java

@@ -21,7 +21,7 @@
 package com.comapi;
 
 import android.app.Application;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.comapi.internal.CallbackAdapter;

COMAPI/foundation/src/main/java/com/comapi/ComapiClient.java

@@ -22,7 +22,7 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.comapi.internal.CallbackAdapter;
 
@@ -89,7 +89,7 @@ public ServiceAccessor service() {
     /**
      * Gets the content of internal log files.
      *
-     * @deprecated Use safer version - {@link this#copyLogs(File)} instead.
+     * @deprecated Use safer version - {@link ComapiClient#copyLogs(File)} instead.
      */
     @Deprecated
     public void getLogs(Callback<String> callback) {

COMAPI/foundation/src/main/java/com/comapi/RxComapi.java

@@ -21,7 +21,7 @@
 package com.comapi;
 
 import android.app.Application;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.comapi.internal.CallbackAdapter;