From 2e3a2be75db3ad8716e56c4d62d698bad1d383e0 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 15 Nov 2022 19:58:30 +0100 Subject: [PATCH] bump compileSdkVersion to 32 Signed-off-by: Andy Scherzinger --- app/build.gradle | 2 +- .../nextcloud/talk/activities/FullScreenImageActivity.kt | 2 +- .../nextcloud/talk/activities/FullScreenMediaActivity.kt | 2 +- .../talk/activities/FullScreenTextViewerActivity.kt | 2 +- .../nextcloud/talk/messagesearch/MessageSearchActivity.kt | 6 +++--- .../activities/RemoteFileBrowserActivity.kt | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0d946a5ef..8ca60076a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,7 +36,7 @@ apply plugin: "org.jlleitschuh.gradle.ktlint" apply plugin: 'kotlinx-serialization' android { - compileSdkVersion 31 + compileSdkVersion 32 buildToolsVersion '33.0.0' namespace 'com.nextcloud.talk' diff --git a/app/src/main/java/com/nextcloud/talk/activities/FullScreenImageActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/FullScreenImageActivity.kt index b993e5ee6..5bdd38f25 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/FullScreenImageActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/FullScreenImageActivity.kt @@ -46,7 +46,7 @@ class FullScreenImageActivity : AppCompatActivity() { private lateinit var path: String private var showFullscreen = false - override fun onCreateOptionsMenu(menu: Menu?): Boolean { + override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.menu_preview, menu) return true } diff --git a/app/src/main/java/com/nextcloud/talk/activities/FullScreenMediaActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/FullScreenMediaActivity.kt index cfadded62..2a076065d 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/FullScreenMediaActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/FullScreenMediaActivity.kt @@ -49,7 +49,7 @@ class FullScreenMediaActivity : AppCompatActivity(), Player.Listener { private lateinit var path: String private lateinit var player: SimpleExoPlayer - override fun onCreateOptionsMenu(menu: Menu?): Boolean { + override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.menu_preview, menu) return true } diff --git a/app/src/main/java/com/nextcloud/talk/activities/FullScreenTextViewerActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/FullScreenTextViewerActivity.kt index 5bf306c1c..e0dd0d35d 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/FullScreenTextViewerActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/FullScreenTextViewerActivity.kt @@ -50,7 +50,7 @@ class FullScreenTextViewerActivity : AppCompatActivity() { private lateinit var path: String - override fun onCreateOptionsMenu(menu: Menu?): Boolean { + override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.menu_preview, menu) return true } diff --git a/app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt b/app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt index 0f2a732a0..ddf794841 100644 --- a/app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt @@ -210,13 +210,13 @@ class MessageSearchActivity : BaseActivity() { binding.emptyContainer.emptyListView.visibility = View.VISIBLE } - override fun onCreateOptionsMenu(menu: Menu?): Boolean { + override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.menu_search, menu) return true } - override fun onPrepareOptionsMenu(menu: Menu?): Boolean { - val menuItem = menu!!.findItem(R.id.action_search) + override fun onPrepareOptionsMenu(menu: Menu): Boolean { + val menuItem = menu.findItem(R.id.action_search) searchView = menuItem.actionView as SearchView setupSearchView() menuItem.setOnActionExpandListener(object : MenuItem.OnActionExpandListener { diff --git a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt index c91ca0ebd..bd9f74b9d 100644 --- a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt @@ -180,7 +180,7 @@ class RemoteFileBrowserActivity : AppCompatActivity(), SelectionInterface, Swipe showList() } - override fun onCreateOptionsMenu(menu: Menu?): Boolean { + override fun onCreateOptionsMenu(menu: Menu): Boolean { super.onCreateOptionsMenu(menu) menuInflater.inflate(R.menu.menu_share_files, menu) filesSelectionDoneMenuItem = menu?.findItem(R.id.files_selection_done)