From 6fd725e8be38f8538b685c721579b46cf524c49a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 07:28:23 +0000 Subject: [PATCH 1/3] fix(deps): update dependency androidx.appcompat:appcompat to v1.7.0 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- app/build.gradle | 2 +- gradle/verification-metadata.xml | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index fd2435cb8..cd7c90dfd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -168,7 +168,7 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3" - implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'com.google.android.material:material:1.12.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation "com.vanniktech:emoji-google:0.18.0" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 860ead256..7c028620d 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -8,6 +8,9 @@ + + + @@ -158,6 +161,7 @@ + @@ -247,6 +251,11 @@ + + + + + @@ -842,6 +851,14 @@ + + + + + + + + @@ -971,6 +988,11 @@ + + + + + @@ -997,6 +1019,11 @@ + + + + + @@ -5140,6 +5167,7 @@ + From 0a24f043b8626b06f5b5a6879ee51ea6580883ff Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 19 Jun 2024 17:06:09 +0200 Subject: [PATCH 2/3] fix: remove use of LayoutInflater.from(Context) Signed-off-by: Andy Scherzinger --- .../talk/conversation/CreateConversationDialogFragment.kt | 2 +- .../talk/conversation/RenameConversationDialogFragment.kt | 2 +- .../nextcloud/talk/polls/ui/PollCreateDialogFragment.kt | 2 +- .../com/nextcloud/talk/polls/ui/PollMainDialogFragment.kt | 2 +- .../talk/ui/dialog/ChooseAccountDialogFragment.java | 7 ++++--- .../talk/ui/dialog/ChooseAccountShareToDialogFragment.kt | 2 +- .../com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt | 2 +- .../talk/ui/dialog/FileAttachmentPreviewFragment.kt | 2 +- .../nextcloud/talk/ui/dialog/FilterConversationFragment.kt | 2 +- .../nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt | 2 +- .../talk/ui/dialog/SortingOrderDialogFragment.java | 2 +- 11 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt index fc8411876..aa439c11f 100644 --- a/app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt @@ -98,7 +98,7 @@ class CreateConversationDialogFragment : DialogFragment() { @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - binding = DialogCreateConversationBinding.inflate(LayoutInflater.from(context)) + binding = DialogCreateConversationBinding.inflate(layoutInflater) val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context) .setTitle(resources.getString(R.string.create_conversation)) diff --git a/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt index fa2c60f5d..71ce7d09b 100644 --- a/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt @@ -68,7 +68,7 @@ class RenameConversationDialogFragment : DialogFragment() { @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - binding = DialogRenameConversationBinding.inflate(LayoutInflater.from(context)) + binding = DialogRenameConversationBinding.inflate(layoutInflater) val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context) .setTitle(resources.getString(R.string.nc_rename)) diff --git a/app/src/main/java/com/nextcloud/talk/polls/ui/PollCreateDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/polls/ui/PollCreateDialogFragment.kt index 7db876580..d2f02d7ba 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/ui/PollCreateDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/ui/PollCreateDialogFragment.kt @@ -57,7 +57,7 @@ class PollCreateDialogFragment : DialogFragment(), PollCreateOptionsItemListener @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - binding = DialogPollCreateBinding.inflate(LayoutInflater.from(context)) + binding = DialogPollCreateBinding.inflate(layoutInflater) val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context) .setView(binding.root) diff --git a/app/src/main/java/com/nextcloud/talk/polls/ui/PollMainDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/polls/ui/PollMainDialogFragment.kt index 5b7726ef4..5a569c885 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/ui/PollMainDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/ui/PollMainDialogFragment.kt @@ -61,7 +61,7 @@ class PollMainDialogFragment : DialogFragment() { @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - binding = DialogPollMainBinding.inflate(LayoutInflater.from(context)) + binding = DialogPollMainBinding.inflate(layoutInflater) val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context).setView(binding.root) diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java index 3efe7b221..24c7de5e1 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java @@ -37,12 +37,13 @@ import com.nextcloud.talk.ui.StatusDrawable; import com.nextcloud.talk.ui.theme.ViewThemeUtils; import com.nextcloud.talk.users.UserManager; import com.nextcloud.talk.utils.ApiUtils; -import com.nextcloud.talk.utils.DisplayUtils; import com.nextcloud.talk.utils.CapabilitiesUtil; +import com.nextcloud.talk.utils.DisplayUtils; import java.net.CookieManager; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import javax.inject.Inject; @@ -94,7 +95,7 @@ public class ChooseAccountDialogFragment extends DialogFragment { @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - binding = DialogChooseAccountBinding.inflate(LayoutInflater.from(requireContext())); + binding = DialogChooseAccountBinding.inflate(getLayoutInflater()); dialogView = binding.getRoot(); return new MaterialAlertDialogBuilder(requireContext()).setView(dialogView).create(); @@ -103,7 +104,7 @@ public class ChooseAccountDialogFragment extends DialogFragment { @Override public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this); + Objects.requireNonNull(NextcloudTalkApplication.Companion.getSharedApplication()).getComponentApplication().inject(this); User user = userManager.getCurrentUser().blockingGet(); themeViews(); diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountShareToDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountShareToDialogFragment.kt index 4798f20d2..8d71e77d8 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountShareToDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountShareToDialogFragment.kt @@ -53,7 +53,7 @@ class ChooseAccountShareToDialogFragment : DialogFragment() { @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - binding = DialogChooseAccountShareToBinding.inflate(LayoutInflater.from(requireContext())) + binding = DialogChooseAccountShareToBinding.inflate(layoutInflater) dialogView = binding!!.root return MaterialAlertDialogBuilder(requireContext()).setView(dialogView).create() } diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt index 160a3756f..603bc877c 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt @@ -56,7 +56,7 @@ class DateTimePickerFragment : DialogFragment() { lateinit var viewThemeUtils: ViewThemeUtils override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - binding = DialogDateTimePickerBinding.inflate(LayoutInflater.from(context)) + binding = DialogDateTimePickerBinding.inflate(layoutInflater) dialogView = binding.root viewModel = (requireActivity() as ChatActivity).chatViewModel arguments?.let { diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt index ed006262b..0be7ecb1e 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt @@ -45,7 +45,7 @@ class FileAttachmentPreviewFragment : DialogFragment() { filesList = it.getStringArrayList(FILES_TO_UPLOAD_ARG)!! } - binding = DialogFileAttachmentPreviewBinding.inflate(LayoutInflater.from(context)) + binding = DialogFileAttachmentPreviewBinding.inflate(layoutInflater) return MaterialAlertDialogBuilder(requireContext()).setView(binding.root).create() } diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt index e4cfd93bf..595401fb2 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt @@ -40,7 +40,7 @@ class FilterConversationFragment : DialogFragment() { @Inject lateinit var arbitraryStorageManager: ArbitraryStorageManager override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - binding = DialogFilterConversationBinding.inflate(LayoutInflater.from(context)) + binding = DialogFilterConversationBinding.inflate(layoutInflater) dialogView = binding.root filterState = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { arguments?.getSerializable(FILTER_STATE_ARG, HashMap::class.java) as HashMap diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt index cad4eff9e..1e8577aba 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt @@ -155,7 +155,7 @@ class SetStatusDialogFragment : @SuppressLint("InflateParams") override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - binding = DialogSetStatusBinding.inflate(LayoutInflater.from(context)) + binding = DialogSetStatusBinding.inflate(layoutInflater) val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context).setView(binding.root) viewThemeUtils.dialog.colorMaterialAlertDialogBackground(binding.root.context, dialogBuilder) diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/SortingOrderDialogFragment.java b/app/src/main/java/com/nextcloud/talk/ui/dialog/SortingOrderDialogFragment.java index 96dbf18ba..c23a60a88 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/SortingOrderDialogFragment.java +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/SortingOrderDialogFragment.java @@ -83,7 +83,7 @@ public class SortingOrderDialogFragment extends DialogFragment implements View.O @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - binding = SortingOrderFragmentBinding.inflate(LayoutInflater.from(requireContext())); + binding = SortingOrderFragmentBinding.inflate(getLayoutInflater()); dialogView = binding.getRoot(); return new MaterialAlertDialogBuilder(requireContext()).setView(dialogView).create(); From 86f9a157dd829f3c25c660843d73671e97d20514 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 19 Jun 2024 17:09:00 +0200 Subject: [PATCH 3/3] ci: bump lint scores Signed-off-by: Andy Scherzinger --- scripts/analysis/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index dc23e72dc..307e43429 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 10 errors and 79 warnings + Lint Report: 129 errors and 90 warnings