浏览代码

Fix some type errors after sdk 30 bump

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
Álvaro Brey Vilas 3 年之前
父节点
当前提交
d92e3cbfaa

+ 2 - 2
src/main/java/com/nextcloud/client/errorhandling/ShowErrorActivity.kt

@@ -78,8 +78,8 @@ class ShowErrorActivity : AppCompatActivity() {
         return super.onCreateOptionsMenu(menu)
         return super.onCreateOptionsMenu(menu)
     }
     }
 
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        return when (item?.itemId) {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
             R.id.error_share -> { onClickedShare(); true }
             R.id.error_share -> { onClickedShare(); true }
             else -> super.onOptionsItemSelected(item)
             else -> super.onOptionsItemSelected(item)
         }
         }

+ 2 - 2
src/main/java/com/nextcloud/client/etm/EtmActivity.kt

@@ -59,8 +59,8 @@ class EtmActivity : ToolbarActivity(), Injectable {
         )
         )
     }
     }
 
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        return when (item?.itemId) {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
             android.R.id.home -> {
             android.R.id.home -> {
                 if (!vm.onBackPressed()) {
                 if (!vm.onBackPressed()) {
                     finish()
                     finish()

+ 1 - 1
src/main/java/com/nextcloud/client/files/downloader/FileTransferService.kt

@@ -113,7 +113,7 @@ class FileTransferService : Service() {
             )
             )
         }
         }
 
 
-        val request = intent.getParcelableExtra(EXTRA_REQUEST) as Request
+        val request: Request = intent.getParcelableExtra(EXTRA_REQUEST)!!
         val transferManager = getTransferManager(request.user)
         val transferManager = getTransferManager(request.user)
         transferManager.enqueue(request)
         transferManager.enqueue(request)
 
 

+ 1 - 2
src/main/java/com/nextcloud/client/jobs/NotificationWork.kt

@@ -297,8 +297,7 @@ class NotificationWork constructor(
                                     .getClientFor(user.toOwnCloudAccount(), context)
                                     .getClientFor(user.toOwnCloudAccount(), context)
                                 val actionType = intent.getStringExtra(KEY_NOTIFICATION_ACTION_TYPE)
                                 val actionType = intent.getStringExtra(KEY_NOTIFICATION_ACTION_TYPE)
                                 val actionLink = intent.getStringExtra(KEY_NOTIFICATION_ACTION_LINK)
                                 val actionLink = intent.getStringExtra(KEY_NOTIFICATION_ACTION_LINK)
-                                val success: Boolean
-                                success = if (!TextUtils.isEmpty(actionType) && !TextUtils.isEmpty(actionLink)) {
+                                val success: Boolean = if (!actionType.isNullOrEmpty() && !actionLink.isNullOrEmpty()) {
                                     val resultCode = executeAction(actionType, actionLink, client)
                                     val resultCode = executeAction(actionType, actionLink, client)
                                     resultCode == HttpStatus.SC_OK || resultCode == HttpStatus.SC_ACCEPTED
                                     resultCode == HttpStatus.SC_OK || resultCode == HttpStatus.SC_ACCEPTED
                                 } else {
                                 } else {

+ 2 - 2
src/main/java/com/nextcloud/client/media/PlayerService.kt

@@ -137,8 +137,8 @@ class PlayerService : Service() {
     }
     }
 
 
     private fun onActionPlay(intent: Intent) {
     private fun onActionPlay(intent: Intent) {
-        val user: User = intent.getParcelableExtra(EXTRA_USER) as User
-        val file: OCFile = intent.getParcelableExtra(EXTRA_FILE) as OCFile
+        val user: User = intent.getParcelableExtra(EXTRA_USER)!!
+        val file: OCFile = intent.getParcelableExtra(EXTRA_FILE)!!
         val startPos = intent.getLongExtra(EXTRA_START_POSITION_MS, 0)
         val startPos = intent.getLongExtra(EXTRA_START_POSITION_MS, 0)
         val autoPlay = intent.getBooleanExtra(EXTRA_AUTO_PLAY, true)
         val autoPlay = intent.getBooleanExtra(EXTRA_AUTO_PLAY, true)
         val item = PlaylistItem(file = file, startPositionMs = startPos, autoPlay = autoPlay, user = user)
         val item = PlaylistItem(file = file, startPositionMs = startPos, autoPlay = autoPlay, user = user)