From 7285c0ae44a7f808a1abdb6119939acb80c3c4be Mon Sep 17 00:00:00 2001 From: rapterjet2004 Date: Wed, 23 Oct 2024 08:54:18 -0500 Subject: [PATCH] codacy and analysis Signed-off-by: rapterjet2004 --- app/src/main/java/com/nextcloud/talk/api/NcApi.java | 8 -------- .../conversationinfo/ConversationInfoActivity.kt | 12 ++++++++---- .../nextcloud/talk/data/source/local/Migrations.kt | 3 ++- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/api/NcApi.java b/app/src/main/java/com/nextcloud/talk/api/NcApi.java index c2c8c6386..f0957ef4d 100644 --- a/app/src/main/java/com/nextcloud/talk/api/NcApi.java +++ b/app/src/main/java/com/nextcloud/talk/api/NcApi.java @@ -727,12 +727,4 @@ public interface NcApi { @DELETE Observable unbanActor(@Header("Authorization") String authorization, @Url String url); - - @POST - Observable archiveConversation(@Header("Authorization") String authorization, - @Url String url); - - @DELETE - Observable unarchiveConversation(@Header("Authorization") String authorization, - @Url String url); } \ No newline at end of file diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt index 8d21c21e9..9d93852bd 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt @@ -22,6 +22,7 @@ import android.view.View import android.view.View.GONE import android.view.View.VISIBLE import androidx.appcompat.app.AlertDialog +import androidx.core.content.res.ResourcesCompat import androidx.fragment.app.FragmentTransaction import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope @@ -752,12 +753,13 @@ class ConversationInfoActivity : if (conversation!!.hasArchived) { viewModel.unarchiveConversation(conversationUser, conversationToken) binding.archiveConversationIcon - .setImageDrawable(resources.getDrawable(R.drawable.outline_archive_24)) + .setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.outline_archive_24, null)) binding.archiveConversationText.text = resources.getString(R.string.archive_conversation) binding.archiveConversationTextHint.text = resources.getString(R.string.archive_hint) } else { viewModel.archiveConversation(conversationUser, conversationToken) - binding.archiveConversationIcon.setImageDrawable(resources.getDrawable(R.drawable.ic_eye)) + binding.archiveConversationIcon + .setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.ic_eye, null)) binding.archiveConversationText.text = resources.getString(R.string.unarchive_conversation) binding.archiveConversationTextHint.text = resources.getString(R.string.unarchive_hint) } @@ -765,11 +767,13 @@ class ConversationInfoActivity : } if (conversation!!.hasArchived) { - binding.archiveConversationIcon.setImageDrawable(resources.getDrawable(R.drawable.ic_eye)) + binding.archiveConversationIcon + .setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.ic_eye, null)) binding.archiveConversationText.text = resources.getString(R.string.unarchive_conversation) binding.archiveConversationTextHint.text = resources.getString(R.string.unarchive_hint) } else { - binding.archiveConversationIcon.setImageDrawable(resources.getDrawable(R.drawable.outline_archive_24)) + binding.archiveConversationIcon + .setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.outline_archive_24, null)) binding.archiveConversationText.text = resources.getString(R.string.archive_conversation) binding.archiveConversationTextHint.text = resources.getString(R.string.archive_hint) } diff --git a/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt b/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt index 5b93f34ca..e255357cb 100644 --- a/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt +++ b/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt @@ -9,6 +9,7 @@ package com.nextcloud.talk.data.source.local import android.util.Log import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase +import java.sql.SQLException @Suppress("MagicNumber") object Migrations { @@ -251,7 +252,7 @@ object Migrations { "ALTER TABLE Conversations " + "ADD `hasArchived` INTEGER;" ) - } catch (e: Exception) { + } catch (e: SQLException) { Log.i("Migrations", "hasArchived already exists") } }