At/kotlin authenticator (andretietz#81)

* upgrading kotlin to 1.2.61

* Converting AccountAuthenticator into kotlin.

* detekt fix

* ktlint and test fix

Author: andretietz

gradle.properties

@@ -1,5 +1,5 @@
 # Release Settings
-kotlinVersion=1.2.30
+kotlinVersion=1.2.61
 okhttpVersion=3.10.0
 retrofitVersion=2.3.0
 

retroauth-android/src/main/java/com/andretietz/retroauth/AccountAuthenticator.java

@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2015 Andre Tietz
+ *
+ * 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.
+ */
+
+package com.andretietz.retroauth
+
+import android.accounts.AbstractAccountAuthenticator
+import android.accounts.Account
+import android.accounts.AccountAuthenticatorResponse
+import android.accounts.AccountManager
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+
+/**
+ * This AccountAuthenticator is a very basic implementation of Android's
+ * [AbstractAccountAuthenticator]. This implementation is intentional as empty as it is. Cause of this is, that
+ * it's executed in a different process, which makes it difficult to provide login endpoints from
+ * the app process in here.
+ *
+ * NOTE: This class cannot be replaced with a kotlin version yet, since Android cannot load Authenticators
+ * that are non java once
+ */
+class AccountAuthenticator(
+  context: Context,
+  internal val action: String
+) : AbstractAccountAuthenticator(context) {
+
+  override fun addAccount(
+    response: AccountAuthenticatorResponse,
+    accountType: String,
+    authTokenType: String?,
+    requiredFeatures: Array<String>?,
+    options: Bundle
+  ) = createAuthBundle(response, action, accountType, authTokenType, null)
+
+  override fun getAuthToken(
+    response: AccountAuthenticatorResponse,
+    account: Account,
+    authTokenType: String,
+    options: Bundle
+  ) = createAuthBundle(response, action, account.type, authTokenType, account.name)
+
+  /**
+   * Creates an Intent to open the Activity to login.
+   *
+   * @param response needed parameter
+   * @param accountType The account Type
+   * @param tokenType The requested token type
+   * @param accountName The name of the account
+   * @return a bundle to open the activity
+   */
+  private fun createAuthBundle(
+    response: AccountAuthenticatorResponse,
+    action: String,
+    accountType: String,
+    tokenType: String?,
+    accountName: String?
+  ): Bundle? = Bundle().apply {
+    putParcelable(
+      AccountManager.KEY_INTENT,
+      Intent(action).apply {
+        putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response)
+        putExtra(AccountManager.KEY_ACCOUNT_TYPE, accountType)
+        putExtra(KEY_TOKEN_TYPE, tokenType)
+        accountName?.let {
+          putExtra(AccountManager.KEY_ACCOUNT_NAME, it)
+        }
+      })
+  }
+
+  override fun confirmCredentials(
+    response: AccountAuthenticatorResponse,
+    account: Account,
+    options: Bundle?
+  ) = null
+
+  override fun editProperties(response: AccountAuthenticatorResponse, accountType: String) = null
+
+  override fun getAuthTokenLabel(authTokenType: String) = null
+
+  override fun updateCredentials(
+    response: AccountAuthenticatorResponse,
+    account: Account,
+    authTokenType: String,
+    options: Bundle
+  ): Bundle? = null
+
+  override fun hasFeatures(
+    response: AccountAuthenticatorResponse,
+    account: Account,
+    features: Array<String>
+  ) = null
+
+  companion object {
+    const val KEY_TOKEN_TYPE = "account_token_type"
+  }
+}

retroauth-android/src/main/java/com/andretietz/retroauth/AccountAuthenticator.kt

@@ -40,7 +40,7 @@ class AccountAuthenticatorTest {
       arrayOf(), mock(Bundle::class.java))
 
     assertNotNull(bundle)
-    val intent = bundle.getParcelable<Intent>(AccountManager.KEY_INTENT)
+    val intent = requireNotNull(bundle).getParcelable<Intent>(AccountManager.KEY_INTENT)
     assertNotNull(intent)
 
     assertEquals(
@@ -57,7 +57,7 @@ class AccountAuthenticatorTest {
     val bundle = authenticator.getAuthToken(response, account, "tokenType", mock(Bundle::class.java))
 
     assertNotNull(bundle)
-    val intent = bundle.getParcelable<Intent>(AccountManager.KEY_INTENT)
+    val intent = requireNotNull(bundle).getParcelable<Intent>(AccountManager.KEY_INTENT)
     assertNotNull(intent)
 
     assertEquals(