Update project to use SDK 35

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())
 

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<ActivityMainBinding>() {
         R.layout.navigation_view_item_with_amount, binding.navigationView, false
       )
       val textViewMsgsCount = view.findViewById<TextView>(R.id.textViewMessageCount)
-      textViewMsgsCount.text = folder.msgCount.toString()
+      textViewMsgsCount.text = "${folder.msgCount}"
       menuItem.actionView = view
     } else {
       menuItem.actionView = null

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<FragmentAddOtherAccountBindin
       R.id.spinnerImapSecurityType -> {
         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<FragmentAddOtherAccountBindin
       R.id.spinnerSmtpSecyrityType -> {
         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<FragmentAddOtherAccountBindin
       }
       binding?.editTextUserName?.setText(nonNullAuthCreds.username)
       binding?.editTextImapServer?.setText(nonNullAuthCreds.imapServer)
-      binding?.editTextImapPort?.setText(nonNullAuthCreds.imapPort.toString())
+      binding?.editTextImapPort?.setText("${nonNullAuthCreds.imapPort}")
       binding?.editTextSmtpServer?.setText(nonNullAuthCreds.smtpServer)
-      binding?.editTextSmtpPort?.setText(nonNullAuthCreds.smtpPort.toString())
+      binding?.editTextSmtpPort?.setText("${nonNullAuthCreds.smtpPort}")
       binding?.checkBoxRequireSignInForSmtp?.isChecked = nonNullAuthCreds.hasCustomSignInForSmtp
       binding?.editTextSmtpUsername?.setText(nonNullAuthCreds.smtpSigInUsername)
       binding?.editTextSmtpPassword?.setText(nonNullAuthCreds.smtpSignInPassword)

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ServerSettingsFragment.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
@@ -26,13 +26,13 @@ import com.flowcrypt.email.database.MessageState
 import com.flowcrypt.email.database.entity.AccountEntity
 import com.flowcrypt.email.databinding.FragmentServerSettingsBinding
 import com.flowcrypt.email.extensions.android.os.getSerializableViaExt
-import com.flowcrypt.email.extensions.hideKeyboard
 import com.flowcrypt.email.extensions.androidx.fragment.app.launchAndRepeatWithViewLifecycle
 import com.flowcrypt.email.extensions.androidx.fragment.app.navController
-import com.flowcrypt.email.extensions.onItemSelected
 import com.flowcrypt.email.extensions.androidx.fragment.app.setFragmentResultListenerForTwoWayDialog
 import com.flowcrypt.email.extensions.androidx.fragment.app.showTwoWayDialog
 import com.flowcrypt.email.extensions.androidx.fragment.app.toast
+import com.flowcrypt.email.extensions.hideKeyboard
+import com.flowcrypt.email.extensions.onItemSelected
 import com.flowcrypt.email.jetpack.viewmodel.AccountSettingsViewModel
 import com.flowcrypt.email.jetpack.workmanager.MessagesSenderWorker
 import com.flowcrypt.email.jetpack.workmanager.sync.InboxIdleSyncWorker
@@ -41,8 +41,8 @@ import com.flowcrypt.email.ui.activity.fragment.base.ProgressBehaviour
 import com.flowcrypt.email.ui.activity.fragment.dialog.TwoWayDialogFragment
 import com.flowcrypt.email.ui.notifications.ErrorNotificationManager
 import com.flowcrypt.email.util.GeneralUtil
-import org.eclipse.angus.mail.util.MailConnectException
 import kotlinx.coroutines.launch
+import org.eclipse.angus.mail.util.MailConnectException
 import java.net.SocketTimeoutException
 
 /**
@@ -108,7 +108,7 @@ class ServerSettingsFragment : BaseFragment<FragmentServerSettingsBinding>(), 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<FragmentServerSettingsBinding>(), 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
       }

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
 }
 

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

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