From 40fc6ec2e07941931b2e72f02a0b44da09c7345a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sat, 3 Oct 2020 01:08:57 +0200
Subject: [PATCH] Upgrade android sdk to 30 (#966)

---
 .travis.yml                                   | 24 +++++++++-------
 app/build.gradle                              |  6 ++--
 .../wulkanowy/ui/modules/main/MainActivity.kt |  4 +--
 .../message/preview/MessagePreviewFragment.kt |  2 +-
 .../message/send/SendMessageActivity.kt       |  6 ++--
 .../io/github/wulkanowy/utils/LoggerUtils.kt  | 28 +++++++++----------
 6 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 24280c5f..dc9df619 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ jdk: oraclejdk8
 
 env:
  global:
-    - ANDROID_API_LEVEL=29
-    - ANDROID_BUILD_TOOLS_VERSION=29.0.3
+   - ANDROID_API_LEVEL=30
+   - ANDROID_BUILD_TOOLS_VERSION=30.0.2
 
 cache:
   directories:
@@ -28,22 +28,26 @@ android:
     - build-tools-$ANDROID_BUILD_TOOLS_VERSION
     # The SDK version used to compile your project
     - android-$ANDROID_API_LEVEL
-    # Additional components
+   # Additional components
     - extra-google-google_play_services
     - extra-google-m2repository
     - extra-android-m2repository
     - addon-google_apis-google-$ANDROID_API_LEVEL
-    # Android emulator
+   # Android emulator
     - android-22
     - sys-img-armeabi-v7a-android-22
 
+before_install:
+  - yes | sdkmanager "platforms;android-30"
+  - yes | sdkmanager "build-tools;30.0.2"
+
 before_script:
-    # Launch emulator before the execution
-    - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
-    - emulator -avd test -no-audio -no-window &
-    - android-wait-for-emulator
-    - adb shell input keyevent 82 &
-    - "curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | sudo bash"
+  # Launch emulator before the execution
+  - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
+  - emulator -avd test -no-audio -no-window &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
+  - "curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | sudo bash"
 
 script:
   - ./gradlew dependencies --stacktrace --daemon
diff --git a/app/build.gradle b/app/build.gradle
index 6bcb9765..1cd3b990 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,14 +10,14 @@ apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.2'
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 17
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 72
         versionName "0.21.2"
         multiDexEnabled true
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index 95b4aa77..53ac1631 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -181,8 +181,8 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
         analytics.setCurrentScreen(this, name)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        return if (item?.itemId == R.id.mainMenuAccount) presenter.onAccountManagerSelected()
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return if (item.itemId == R.id.mainMenuAccount) presenter.onAccountManagerSelected()
         else false
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
index 740f4927..b35731ca 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
@@ -174,7 +174,7 @@ class MessagePreviewFragment :
 
     @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
     override fun printDocument(html: String, jobName: String) {
-        val webView = WebView(activity)
+        val webView = WebView(requireContext())
         webView.webViewClient = object : WebViewClient() {
 
             override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest) = false
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
index 2267279c..59944d41 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.message.send
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.graphics.Rect
@@ -74,6 +75,7 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
         presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_MESSAGE) as? Message, intent.getSerializableExtra(EXTRA_REPLY) as? Boolean)
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     override fun initView() {
         setUpExtendedHitArea()
         with(binding) {
@@ -87,8 +89,8 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessa
         return true
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        return if (item?.itemId == R.id.sendMessageMenuSend) presenter.onSend()
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return if (item.itemId == R.id.sendMessageMenuSend) presenter.onSend()
         else false
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt b/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
index fc352849..48d46892 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
@@ -22,32 +22,32 @@ private fun Bundle?.checkSavedState() = if (this == null) "(STATE IS NULL)" else
 
 class ActivityLifecycleLogger : Application.ActivityLifecycleCallbacks {
 
-    override fun onActivityPaused(activity: Activity?) {
-        activity?.let { Timber.d("${it::class.java.simpleName} PAUSED") }
+    override fun onActivityPaused(activity: Activity) {
+        Timber.d("${activity::class.java.simpleName} PAUSED")
     }
 
-    override fun onActivityResumed(activity: Activity?) {
-        activity?.let { Timber.d("${it::class.java.simpleName} RESUMED") }
+    override fun onActivityResumed(activity: Activity) {
+        Timber.d("${activity::class.java.simpleName} RESUMED")
     }
 
-    override fun onActivityStarted(activity: Activity?) {
-        activity?.let { Timber.d("${it::class.java.simpleName} STARTED") }
+    override fun onActivityStarted(activity: Activity) {
+        Timber.d("${activity::class.java.simpleName} STARTED")
     }
 
-    override fun onActivityDestroyed(activity: Activity?) {
-        activity?.let { Timber.d("${it::class.java.simpleName} DESTROYED") }
+    override fun onActivityDestroyed(activity: Activity) {
+        Timber.d("${activity::class.java.simpleName} DESTROYED")
     }
 
-    override fun onActivitySaveInstanceState(activity: Activity?, outState: Bundle?) {
-        activity?.let { Timber.d("${it::class.java.simpleName} SAVED INSTANCE STATE") }
+    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
+        Timber.d("${activity::class.java.simpleName} SAVED INSTANCE STATE")
     }
 
-    override fun onActivityStopped(activity: Activity?) {
-        activity?.let { Timber.d("${it::class.java.simpleName} STOPPED") }
+    override fun onActivityStopped(activity: Activity) {
+        Timber.d("${activity::class.java.simpleName} STOPPED")
     }
 
-    override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) {
-        activity?.let { Timber.d("${it::class.java.simpleName} CREATED ${savedInstanceState.checkSavedState()}") }
+    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+        Timber.d("${activity::class.java.simpleName} CREATED ${savedInstanceState.checkSavedState()}")
     }
 }