nullpointer safety, kotlin 1.2.71

Author: andretietz

gradle.properties

@@ -1,10 +1,10 @@
 # Release Settings
-kotlinVersion=1.2.61
+kotlinVersion=1.2.71
 okhttpVersion=3.10.0
 retrofitVersion=2.3.0
 
 GROUP=com.andretietz.retroauth
-VERSION_NAME=3.0.0-beta7-SNAPSHOT
+VERSION_NAME=3.0.0-beta8-SNAPSHOT
 POM_DESCRIPTION=A library build on top of retrofit, for simple handling of authenticated requests.
 POM_URL=https://github.com/andretietz/retroauth
 POM_SCM_URL=https://github.com/andretietz/retroauth

retroauth-android/README.md

@@ -3,7 +3,7 @@
 ## Dependencies
 * [Retrofit](https://github.com/square/retrofit) 2.3.0 (transitive from retroauth-core)
 * appcompat-v7 23.0.0
-* kotlin-stdlib 1.2.30
+* kotlin-stdlib 1.2.71
 
 Method-Count: 348
 Field-Count:  77

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

@@ -22,7 +22,6 @@ import android.accounts.AccountManagerCallback
 import android.accounts.AccountManagerFuture
 import android.app.AlertDialog
 import android.app.Application
-import android.app.Dialog
 import android.content.Context
 import android.os.Build
 import android.os.Bundle
@@ -189,14 +188,12 @@ class AndroidOwnerManager constructor(
       val dialog = builder.create()
       dialog.setOnDismissListener { countDownLatch.countDown() }
       dialog.show()
-      keep(dialog)
-    }
-
-    private fun keep(dialog: Dialog) {
-      dialog.window.attributes = WindowManager.LayoutParams().apply {
-        copyFrom(dialog.window.attributes)
-        width = WindowManager.LayoutParams.WRAP_CONTENT
-        height = WindowManager.LayoutParams.WRAP_CONTENT
+      dialog.window?.let { window ->
+        window.attributes = WindowManager.LayoutParams().apply {
+          copyFrom(window.attributes)
+          width = WindowManager.LayoutParams.WRAP_CONTENT
+          height = WindowManager.LayoutParams.WRAP_CONTENT
+        }
       }
     }
   }