Merge branch 'master' of https://github.com/pdvrieze/darwinlib

Author: pdvrieze

.gitignore

@@ -7,3 +7,4 @@
 /.idea/workspace.xml
 /.idea/compiler.xml
 /.idea/artifacts
+local.properties

build.gradle

@@ -37,7 +37,7 @@ ext {
 buildscript {
     ext {
         if (!has('androidPluginVersion')) {
-            androidPluginVersion = '3.4.0'
+            androidPluginVersion = '3.4.1'
         }
         if (!has('kotlin_version')) {
             kotlin_version = '1.3.40'
@@ -58,10 +58,6 @@ buildscript {
 }
 
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.8'
-}
-
 android {
     compileSdkVersion androidTarget.toInteger()
 
@@ -83,12 +79,21 @@ dependencies {
     implementation "com.android.support:support-compat:${androidCompatVersion}"
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
-    api "net.devrieze:android-coroutines:0.7.990"
-    api "net.devrieze:android-coroutines-appcompat:0.7.990"
+    api "net.devrieze:android-coroutines-appcompat:0.7.990-SNAPSHOT"
+    api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.0"
     api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
+repositories {
+    mavenLocal()
+    jcenter()
+    google()
+    maven {
+        url "https://plugins.gradle.org/m2/"
+    }
+}
+
 
 repositories {
     jcenter()

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

gradlew.bat

@@ -0,0 +1 @@
+rootProject.name="darwinlib"

settings.gradle

@@ -20,6 +20,7 @@ import android.accounts.Account
 import android.app.Activity
 import android.content.Context
 import android.support.annotation.CallSuper
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import nl.adaptivity.android.coroutines.CoroutineActivity
 import nl.adaptivity.kotlin.getValue
@@ -232,11 +233,18 @@ interface AuthenticatedWebClient {
     @Throws(IOException::class)
     fun execute(context: Context, request: WebRequest): HttpURLConnection?
 
-    fun CoroutineActivity.execute(request: WebRequest, onSuccess: RequestSuccess) =
-            execute(request, false, NULL_ERROR_HANDLER, onSuccess)
+    fun <A> A.execute(
+        request: WebRequest,
+        onSuccess: RequestSuccess
+    ) where A : Activity, A : CoroutineScope =
+        execute(request, false, NULL_ERROR_HANDLER, onSuccess)
 
-    fun CoroutineActivity.execute(request: WebRequest, onError: RequestFailure, onSuccess: RequestSuccess) =
-            execute(request, false, onError, onSuccess)
+    fun <A> A.execute(
+        request: WebRequest,
+        onError: RequestFailure,
+        onSuccess: RequestSuccess
+    ) where A : Activity, A : CoroutineScope =
+        execute(request, false, onError, onSuccess)
 
     /**
      * Execute the web request. This will launch it's own worker thread so no need to worry. The
@@ -249,7 +257,7 @@ interface AuthenticatedWebClient {
      * @param onError Called when the request fails for some reason
      * @param onSuccess Called when the request was successful.
      */
-    fun CoroutineActivity.execute(request: WebRequest, currentlyInRetry: Boolean, onError: RequestFailure, onSuccess: RequestSuccess): Job
+    fun <A> A.execute(request: WebRequest, currentlyInRetry: Boolean, onError: RequestFailure, onSuccess: RequestSuccess): Job where A : Activity, A:CoroutineScope
 
     companion object {
         private val NULL_ERROR_HANDLER: RequestFailure = RequestFailure { }

src/main/java/nl/adaptivity/android/darwin/AuthenticatedWebClient.kt

@@ -303,10 +303,19 @@ object AuthenticatedWebClientFactory {
     }
 
     @JvmStatic
-    fun CoroutineActivity.tryEnsureAccount(context: Activity,
+    fun <A: CoroutineActivity> tryEnsureAccount(context: A,
                          authBase: URI?,
-                         callback: SerializableHandler<Activity, Maybe<Account?>>): Job {
-        return aLaunch {
+                         callback: SerializableHandler<A, Maybe<Account?>>): Job {
+        return context.aLaunch {
+            callback(context, ensureAccountToplevel(authBase))
+        }
+    }
+
+    @JvmStatic
+    fun <A: CompatCoroutineActivity> tryEnsureAccount(context: A,
+                         authBase: URI?,
+                         callback: SerializableHandler<A, Maybe<Account?>>): Job {
+        return context.aLaunch {
             callback(context, ensureAccountToplevel(authBase))
         }
     }

src/main/java/nl/adaptivity/android/darwin/AuthenticatedWebClientFactory.kt

@@ -24,6 +24,7 @@ import android.content.Context
 import android.os.Build
 import android.support.annotation.WorkerThread
 import android.util.Log
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import nl.adaptivity.android.coroutines.CoroutineActivity
@@ -92,7 +93,12 @@ internal class AuthenticatedWebClientV14(override val account: Account, override
         return null
     }
 
-    override fun CoroutineActivity.execute(request: AuthenticatedWebClient.WebRequest, currentlyInRetry: Boolean, onError: RequestFailure, onSuccess: RequestSuccess): Job {
+    override fun <A> A.execute(
+        request: AuthenticatedWebClient.WebRequest,
+        currentlyInRetry: Boolean,
+        onError: RequestFailure,
+        onSuccess: RequestSuccess
+    ): Job where A : Activity, A : CoroutineScope {
         return launch {
             val connection = execute(this@execute, request)
             when {
@@ -176,4 +182,4 @@ internal class AuthenticatedWebClientV14(override val account: Account, override
 
     }
 
-}
+}

src/main/java/nl/adaptivity/android/darwin/AuthenticatedWebClientV14.kt

@@ -29,10 +29,7 @@ import android.database.Cursor
 import android.net.Uri
 import android.os.Bundle
 import android.widget.Toast
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.*
 import nl.adaptivity.android.coroutines.Maybe
 import nl.adaptivity.android.coroutines.ParcelableContinuation
 import nl.adaptivity.android.darwinlib.R
@@ -151,8 +148,9 @@ class DownloadFragment(): Fragment() {
         /**
          * Async version of [download] that has a callback instead of being a suspend function.
          */
-        fun CoroutineScope.download(activity: Activity, downloadUri: Uri, callback: (Maybe<Uri>) -> Unit) {
-            launch {
+        @Deprecated("This uses the global scope")
+        fun download(activity: Activity, downloadUri: Uri, callback: (Maybe<Uri>) -> Unit) {
+            GlobalScope.launch {
                 try {
                     download(activity, downloadUri).also { callback(Maybe.Ok(it)) }
                 } catch (e: CancellationException) {