Merge remote-tracking branch 'origin/master' into dev

.github/workflows/analysis.yml

@@ -28,7 +28,7 @@ jobs:
                         echo "::set-output name=pr::${{ github.event.pull_request.number }}"
                         echo "::set-output name=repo::${{ github.event.pull_request.head.repo.full_name }}"
                     fi
-            -   uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3
+            -   uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3
                 with:
                     repository: ${{ steps.get-vars.outputs.repo }}
                     ref: ${{ steps.get-vars.outputs.branch }}

.github/workflows/assembleFlavors.yml

@@ -15,7 +15,7 @@ jobs:
             matrix:
                 flavor: [ Generic, Gplay, Huawei ]
         steps:
-            -   uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3
+            -   uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3
             -   name: set up JDK 11
                 uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3
                 with:

.github/workflows/check.yml

@@ -15,7 +15,7 @@ jobs:
             matrix:
                 task: [ detekt, spotlessKotlinCheck ]
         steps:
-            -   uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3
+            -   uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3
             -   name: Set up JDK 11
                 uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3
                 with:

.github/workflows/command-rebase.yml

@@ -31,7 +31,7 @@ jobs:
           reaction-type: "+1"
 
       - name: Checkout the latest code
-        uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3
+        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3
         with:
           fetch-depth: 0
           token: ${{ secrets.COMMAND_BOT_PAT }}

.github/workflows/detectSnapshot.yml

@@ -12,6 +12,6 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            -   uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3
+            -   uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3
             -   name: Detect SNAPSHOT
                 run: scripts/analysis/detectSNAPSHOT.sh

.github/workflows/qa.yml

@@ -15,7 +15,7 @@ jobs:
             -   name: Check if secrets are available
                 run: echo "::set-output name=ok::${{ secrets.KS_PASS != '' }}"
                 id: check-secrets
-            -   uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3
+            -   uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3
                 if: ${{ steps.check-secrets.outputs.ok == 'true' }}
             -   name: set up JDK 11
                 uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3

.github/workflows/screenShotTest.yml

@@ -18,7 +18,7 @@ jobs:
                 color: [ blue ]
                 api-level: [ 27 ]
         steps:
-            -   uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3
+            -   uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3
 
             -   name: Gradle cache
                 uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3

.github/workflows/unit-tests.yml

@@ -14,7 +14,7 @@ jobs:
     test:
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3
+            -   uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3
             -   name: Set up JDK 11
                 uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3
                 with:

app/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:$androidPluginVersion"
         classpath 'com.hiya:jacoco-android:0.2'
-        classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.13'
+        classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.14'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0"
         classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
@@ -270,7 +270,7 @@ dependencies {
     }
     implementation 'com.caverock:androidsvg:1.4'
     implementation 'androidx.annotation:annotation:1.6.0'
-    implementation 'com.vanniktech:emoji-google:0.9.0'
+    implementation 'com.vanniktech:emoji-google:0.16.0'
 
     implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido:$fidoVersion"
     implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido2:$fidoVersion"

app/src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt

@@ -61,6 +61,8 @@ import com.owncloud.android.utils.theme.ViewThemeUtils
 import com.vanniktech.emoji.EmojiManager
 import com.vanniktech.emoji.EmojiPopup
 import com.vanniktech.emoji.google.GoogleEmojiProvider
+import com.vanniktech.emoji.installDisableKeyboardInput
+import com.vanniktech.emoji.installForceSingleEmoji
 import java.util.Calendar
 import java.util.Locale
 import javax.inject.Inject
@@ -172,18 +174,15 @@ class SetStatusDialogFragment :
         binding.setStatus.setOnClickListener { setStatusMessage() }
         binding.emoji.setOnClickListener { popup.show() }
 
-        popup = EmojiPopup.Builder
+        popup = EmojiPopup(view, binding.emoji, onEmojiClickListener = { _ ->
-            .fromRootView(view)
+            popup.dismiss()
-            .setOnEmojiClickListener { _, _ ->
+            binding.emoji.clearFocus()
-                popup.dismiss()
+            val imm: InputMethodManager = context?.getSystemService(Context.INPUT_METHOD_SERVICE) as
-                binding.emoji.clearFocus()
+                InputMethodManager
-                val imm: InputMethodManager = context?.getSystemService(Context.INPUT_METHOD_SERVICE) as
+            imm.hideSoftInputFromWindow(binding.emoji.windowToken, 0)
-                    InputMethodManager
+        })
-                imm.hideSoftInputFromWindow(binding.emoji.windowToken, 0)
+        binding.emoji.installForceSingleEmoji()
-            }
+        binding.emoji.installDisableKeyboardInput(popup)
-            .build(binding.emoji)
-        binding.emoji.disableKeyboardInput(popup)
-        binding.emoji.forceSingleEmoji()
 
         val adapter = ArrayAdapter<String>(requireContext(), android.R.layout.simple_spinner_item)
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)