diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/AttachmentDownloadingWithRestrictionFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/AttachmentDownloadingWithRestrictionFlowTest.kt index d040ae5001..06c2771f8f 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/AttachmentDownloadingWithRestrictionFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/AttachmentDownloadingWithRestrictionFlowTest.kt @@ -46,6 +46,7 @@ import okhttp3.mockwebserver.MockResponse import okhttp3.mockwebserver.RecordedRequest import org.junit.Rule import org.junit.Test +import org.junit.Ignore import org.junit.rules.RuleChain import org.junit.rules.TestRule import org.junit.runner.RunWith @@ -164,6 +165,7 @@ class AttachmentDownloadingWithRestrictionFlowTest : BaseMessageDetailsFlowTest( .around(ScreenshotTestRule()) @Test + @Ignore("will be fixed in https://github.com/FlowCrypt/flowcrypt-android/issues/2914") fun testDownloadingAttachment() { val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()) diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/MainActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/MainActivity.kt index b771f6905c..71e8e0324d 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/MainActivity.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/MainActivity.kt @@ -1,6 +1,6 @@ /* * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 + * Contributors: denbond7 */ package com.flowcrypt.email.ui.activity @@ -417,7 +417,7 @@ class MainActivity : BaseActivity() { R.layout.navigation_view_item_with_amount, binding.navigationView, false ) val textViewMsgsCount = view.findViewById(R.id.textViewMessageCount) - textViewMsgsCount.text = folder.msgCount.toString() + textViewMsgsCount.text = "${folder.msgCount}" menuItem.actionView = view } else { menuItem.actionView = null diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/AddOtherAccountFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/AddOtherAccountFragment.kt index 903bade0ec..14d828b8ff 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/AddOtherAccountFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/AddOtherAccountFragment.kt @@ -1,6 +1,6 @@ /* * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 + * Contributors: denbond7 */ package com.flowcrypt.email.ui.activity.fragment @@ -55,8 +55,8 @@ import com.flowcrypt.email.util.exception.ExceptionUtil import com.google.android.material.snackbar.Snackbar import com.google.gson.Gson import com.google.gson.JsonSyntaxException -import org.eclipse.angus.mail.util.MailConnectException import jakarta.mail.AuthenticationFailedException +import org.eclipse.angus.mail.util.MailConnectException import java.net.SocketTimeoutException /** @@ -114,7 +114,7 @@ class AddOtherAccountFragment : BaseSingInFragment { val (_, _, defImapPort) = parent.adapter.getItem(position) as SecurityType if (isImapSpinnerRestored) { - binding?.editTextImapPort?.setText(defImapPort.toString()) + binding?.editTextImapPort?.setText("$defImapPort") } else { isImapSpinnerRestored = true } @@ -123,7 +123,7 @@ class AddOtherAccountFragment : BaseSingInFragment { val (_, _, _, defSmtpPort) = parent.adapter.getItem(position) as SecurityType if (isSmtpSpinnerRestored) { - binding?.editTextSmtpPort?.setText(defSmtpPort.toString()) + binding?.editTextSmtpPort?.setText("$defSmtpPort") } else { isSmtpSpinnerRestored = true } @@ -295,9 +295,9 @@ class AddOtherAccountFragment : BaseSingInFragment(), Pr binding?.spinnerImapSecurityType?.onItemSelected { parent, _, position, _ -> val securityType = parent?.adapter?.getItem(position) as SecurityType if (isImapSpinnerRestored) { - binding?.editTextImapPort?.setText(securityType.defImapPort.toString()) + binding?.editTextImapPort?.setText("${securityType.defImapPort}") } else { isImapSpinnerRestored = true } @@ -117,7 +117,7 @@ class ServerSettingsFragment : BaseFragment(), Pr binding?.spinnerSmtpSecurityType?.onItemSelected { parent, _, position, _ -> val securityType = parent?.adapter?.getItem(position) as SecurityType if (isSmtpSpinnerRestored) { - binding?.editTextSmtpPort?.setText(securityType.defSmtpPort.toString()) + binding?.editTextSmtpPort?.setText("${securityType.defSmtpPort}") } else { isSmtpSpinnerRestored = true } diff --git a/build.gradle.kts b/build.gradle.kts index d75853c275..c08be71714 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,17 +1,17 @@ /* * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 + * Contributors: denbond7 */ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.5.2" apply false + id("com.android.application") version "8.7.3" apply false id("org.jetbrains.kotlin.android") version "2.1.0" apply false - id("androidx.navigation.safeargs.kotlin") version "2.8.3" apply false + id("androidx.navigation.safeargs.kotlin") version "2.8.5" apply false id("com.starter.easylauncher") version "6.4.0" apply false id("org.jetbrains.kotlin.plugin.parcelize") version "2.0.21" apply false - id("com.google.devtools.ksp") version "2.0.21-1.0.28" apply false + id("com.google.devtools.ksp") version "2.1.0-1.0.29" apply false id("org.ajoberstar.grgit") version "5.3.0" apply false } diff --git a/ext.gradle.kts b/ext.gradle.kts index faf2ca82ac..9d0ddf1fe2 100644 --- a/ext.gradle.kts +++ b/ext.gradle.kts @@ -5,6 +5,6 @@ extra["appVersionCode"] = 161 extra["appVersionName"] = "1.6.1" -extra["compileSdkVersion"] = 34 -extra["targetSdkVersion"] = 34 +extra["compileSdkVersion"] = 35 +extra["targetSdkVersion"] = 35 extra["minSdkVersion"] = 26 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5ae61e3590..df91a54a0a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,11 @@ -#Thu May 09 10:11:23 EEST 2024 +# +# © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com +# Contributors: denbond7 +# + +#Thu Dec 19 13:22:07 EET 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists