diff --git a/.github/workflows/assembleFlavors.yml b/.github/workflows/assembleFlavors.yml index 3f768b223..4837f3fd3 100644 --- a/.github/workflows/assembleFlavors.yml +++ b/.github/workflows/assembleFlavors.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: set up JDK 8 - uses: actions/setup-java@v2.5.0 + uses: actions/setup-java@v3 with: distribution: "temurin" java-version: 8.0 diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 174cfc805..807a53f1c 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 8 - uses: actions/setup-java@v2.5.0 + uses: actions/setup-java@v3 with: distribution: "temurin" java-version: 8.0 diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 62a920abb..7fc36dec7 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -15,7 +15,7 @@ jobs: if: ${{ steps.check-secrets.outputs.ok == 'true' }} - name: set up JDK 8 if: ${{ steps.check-secrets.outputs.ok == 'true' }} - uses: actions/setup-java@v2.5.0 + uses: actions/setup-java@v3 with: distribution: "temurin" java-version: 8.0 diff --git a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt index 9ed3324c2..9380395b4 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt @@ -255,10 +255,11 @@ class AccountVerificationController(args: Bundle? = null) : registerForPush() } else { activity!!.runOnUiThread { - binding.progressText.text = """ - ${binding.progressText.text} - ${resources!!.getString(R.string.nc_push_disabled)} - """.trimIndent() + binding.progressText.text = + """ + ${binding.progressText.text} + ${resources!!.getString(R.string.nc_push_disabled)} + """.trimIndent() } fetchAndStoreCapabilities() } @@ -266,12 +267,11 @@ class AccountVerificationController(args: Bundle? = null) : @SuppressLint("SetTextI18n") override fun onError(e: Throwable) { - binding.progressText.text = """ - ${binding.progressText.text} - """.trimIndent() + - resources!!.getString( - R.string.nc_display_name_not_stored - ) + binding.progressText.text = + """ + ${binding.progressText.text} + """.trimIndent() + + resources!!.getString(R.string.nc_display_name_not_stored) abortVerification() } @@ -303,10 +303,11 @@ class AccountVerificationController(args: Bundle? = null) : } else { if (activity != null) { activity!!.runOnUiThread { - binding.progressText.text = """ - ${binding.progressText.text} - ${resources!!.getString(R.string.nc_display_name_not_fetched)} - """.trimIndent() + binding.progressText.text = + """ + ${binding.progressText.text} + ${resources!!.getString(R.string.nc_display_name_not_fetched)} + """.trimIndent() } } abortVerification() @@ -317,10 +318,11 @@ class AccountVerificationController(args: Bundle? = null) : override fun onError(e: Throwable) { if (activity != null) { activity!!.runOnUiThread { - binding.progressText.text = """ - ${binding.progressText.text} - ${resources!!.getString(R.string.nc_display_name_not_fetched)} - """.trimIndent() + binding.progressText.text = + """ + ${binding.progressText.text} + ${resources!!.getString(R.string.nc_display_name_not_fetched)} + """.trimIndent() } } abortVerification() @@ -348,9 +350,10 @@ class AccountVerificationController(args: Bundle? = null) : if (eventStatus.eventType == EventStatus.EventType.PUSH_REGISTRATION) { if (internalAccountId == eventStatus.userId && !eventStatus.isAllGood && activity != null) { activity!!.runOnUiThread { - binding.progressText!!.text = """ - ${binding.progressText!!.text} - ${resources!!.getString(R.string.nc_push_disabled)} + binding.progressText.text = + """ + ${binding.progressText.text} + ${resources!!.getString(R.string.nc_push_disabled)} """.trimIndent() } } @@ -359,9 +362,10 @@ class AccountVerificationController(args: Bundle? = null) : if (internalAccountId == eventStatus.userId && !eventStatus.isAllGood) { if (activity != null) { activity!!.runOnUiThread { - binding.progressText!!.text = """ - ${binding.progressText!!.text} - ${resources!!.getString(R.string.nc_capabilities_failed)} + binding.progressText.text = + """ + ${binding.progressText.text} + ${resources!!.getString(R.string.nc_capabilities_failed)} """.trimIndent() } } @@ -373,9 +377,10 @@ class AccountVerificationController(args: Bundle? = null) : if (internalAccountId == eventStatus.userId && !eventStatus.isAllGood) { if (activity != null) { activity!!.runOnUiThread { - binding.progressText!!.text = """ - ${binding.progressText!!.text} - ${resources!!.getString(R.string.nc_external_server_failed)} + binding.progressText.text = + """ + ${binding.progressText.text} + ${resources!!.getString(R.string.nc_external_server_failed)} """.trimIndent() } } @@ -510,4 +515,4 @@ class AccountVerificationController(args: Bundle? = null) : } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.kt b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.kt index 389e2a0f9..711011cb2 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.kt @@ -49,12 +49,7 @@ import com.nextcloud.talk.utils.ShareUtils import com.nextcloud.talk.utils.bundle.BundleKeys import com.nextcloud.talk.utils.database.user.UserUtils import com.nextcloud.talk.utils.singletons.ApplicationWideMessageHolder -import com.vanniktech.emoji.EmojiImageView import com.vanniktech.emoji.EmojiPopup -import com.vanniktech.emoji.emoji.Emoji -import com.vanniktech.emoji.listeners.OnEmojiClickListener -import com.vanniktech.emoji.listeners.OnEmojiPopupDismissListener -import com.vanniktech.emoji.listeners.OnEmojiPopupShownListener import org.greenrobot.eventbus.EventBus import org.parceler.Parcels import org.parceler.Parcels.unwrap @@ -143,8 +138,11 @@ class EntryMenuController(args: Bundle) : binding.okButton.alpha = 1.0f } binding.textInputLayout.isErrorEnabled = false - } else if ((binding.textEdit.text.toString().startsWith("http://") || - binding.textEdit.text.toString().startsWith("https://")) && + } else if ( + ( + binding.textEdit.text.toString().startsWith("http://") || + binding.textEdit.text.toString().startsWith("https://") + ) && binding.textEdit.text.toString().contains("/call/") ) { if (!binding.okButton.isEnabled) { @@ -274,9 +272,12 @@ class EntryMenuController(args: Bundle) : } else if (operation === ConversationOperationEnum.OPS_CODE_SHARE_LINK) { if (activity != null) { shareIntent?.putExtra( - Intent.EXTRA_TEXT, ShareUtils.getStringForIntent( + Intent.EXTRA_TEXT, + ShareUtils.getStringForIntent( activity, - binding.textEdit.text.toString(), userUtils, conversation + binding.textEdit.text.toString(), + userUtils, + conversation ) ) val intent = Intent(shareIntent)