Merge branch 'master' into Share

.github/workflows/analysis.yml

@@ -33,7 +33,7 @@ jobs:
                         echo "pr=${{ github.event.pull_request.number }}" >> "$GITHUB_OUTPUT"
                         echo "repo=${{ github.event.pull_request.head.repo.full_name }}" >> "$GITHUB_OUTPUT"
                     fi
-            -   uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+            -   uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
                 with:
                     repository: ${{ steps.get-vars.outputs.repo }}
                     ref: ${{ steps.get-vars.outputs.branch }}

.github/workflows/codeql.yml

@@ -26,7 +26,7 @@ jobs:
         language: [ 'java' ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
       - name: Set Swap Space
         uses: pierotofy/set-swap-space@49819abfb41bd9b44fb781159c033dba90353a7c # v1.0
         with:

.github/workflows/gradle-wrapper-validation.yml

@@ -18,5 +18,5 @@ jobs:
         name: "Validation"
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+            - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
             - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0

.github/workflows/scorecard.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           persist-credentials: false
 

app/build.gradle

@@ -46,8 +46,8 @@ android {
 
         // mayor.minor.hotfix.increment (for increment: 01-50=Alpha / 51-89=RC / 90-99=stable)
         // xx   .xxx  .xx    .xx
-        versionCode 170100018
+        versionCode 170100020
-        versionName "17.10.0 Alpha 18"
+        versionName "17.10.0 Alpha 20"
 
         flavorDimensions "default"
         renderscriptTargetApi 19

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

@@ -1006,7 +1006,11 @@ class ChatActivity :
     @SuppressLint("ClickableViewAccessibility")
     private fun initVoiceRecordButton() {
         if (!isVoiceRecordingLocked) {
-            showMicrophoneButton(true)
+            if (binding.messageInputView.messageInput.text!!.isNotEmpty()) {
+                showMicrophoneButton(false)
+            } else {
+                showMicrophoneButton(true)
+            }
         } else if (isVoiceRecordingInProgress) {
             binding.messageInputView.playPauseBtn.visibility = View.GONE
             binding.messageInputView.seekBar.visibility = View.GONE
@@ -3998,9 +4002,11 @@ class ChatActivity :
 
     private fun showMicrophoneButton(show: Boolean) {
         if (show && CapabilitiesUtilNew.hasSpreedFeatureCapability(conversationUser, "voice-message-sharing")) {
+            Log.d(TAG, "Microphone shown")
             binding.messageInputView.messageSendButton.visibility = View.GONE
             binding.messageInputView.recordAudioButton.visibility = View.VISIBLE
         } else {
+            Log.d(TAG, "Microphone hidden")
             binding.messageInputView.messageSendButton.visibility = View.VISIBLE
             binding.messageInputView.recordAudioButton.visibility = View.GONE
         }

build.gradle

@@ -24,7 +24,7 @@
 buildscript {
 
     ext {
-        kotlinVersion = '1.8.22'
+        kotlinVersion = '1.9.10'
     }
 
     repositories {