diff --git a/FlowCrypt/build.gradle.kts b/FlowCrypt/build.gradle.kts index 04ee60c29e..e338d9c2a9 100644 --- a/FlowCrypt/build.gradle.kts +++ b/FlowCrypt/build.gradle.kts @@ -123,7 +123,6 @@ android { "SHARED_TENANT_FES_URL", "\"https://flowcrypt.test/shared-tenant-fes/\"" ) - buildConfigField("String", "BACKEND_URL", "\"https://flowcrypt.test/backend/\"") buildConfigField("boolean", "IS_HTTP_LOG_ENABLED", "false") buildConfigField("String", "HTTP_LOG_LEVEL", "\"NONE\"") resValue("string", "gradle_is_http_log_enabled", "false") @@ -154,7 +153,6 @@ android { "SHARED_TENANT_FES_URL", "\"https://flowcrypt.com/shared-tenant-fes/\"" ) - buildConfigField("String", "BACKEND_URL", "\"https://flowcrypt.com/api/\"") resValue("string", "gradle_is_acra_enabled", "true") resValue("string", "gradle_is_mail_debug_enabled", "false") resValue("string", "gradle_is_http_log_enabled", "false") diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/SendFeedbackHasAccountFlowTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/SendFeedbackHasAccountFlowTest.kt index 9155c393f0..15691fb94a 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/SendFeedbackHasAccountFlowTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/SendFeedbackHasAccountFlowTest.kt @@ -71,7 +71,7 @@ class SendFeedbackHasAccountFlowTest : BaseFeedbackFragmentTest() { override fun dispatch(request: RecordedRequest): MockResponse { val gson = ApiHelper.getInstance(getTargetContext()).gson - if (request.path?.startsWith("/backend/help/feedback") == true) { + if (request.path?.startsWith("/shared-tenant-fes/api/v1/account/feedback") == true) { return handlePostFeedbackRequest(gson) } diff --git a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseFeedbackFragmentTest.kt b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseFeedbackFragmentTest.kt index b6c8970f02..3675da48c0 100644 --- a/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseFeedbackFragmentTest.kt +++ b/FlowCrypt/src/androidTest/java/com/flowcrypt/email/ui/base/BaseFeedbackFragmentTest.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.base @@ -20,6 +20,6 @@ abstract class BaseFeedbackFragmentTest : BaseTest() { "SGQ4ADpmmXunpe7TYyMRB2t/IQapb3HLbfZlKDTWVqv95rL4VGJTtLltrSTuzpB7XGk13C8Dj8fNY77SrB+5bT" + "M0empyso5HTKLcdM8cHIu0Sz4yAgAVj29yuFbCq9x6S6oH7vkL1RIf/+CFeP17HNVfX5IMAAAAASUVORK5CYII=" - val SCREENSHOT_BYTE_ARRAY: ByteArray = Base64.decode(SCREENSHOT_BASE64, Base64.DEFAULT) + val SCREENSHOT_BYTE_ARRAY: ByteArray = Base64.decode(SCREENSHOT_BASE64, Base64.NO_WRAP) } } diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/RetrofitApiServiceInterface.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/RetrofitApiServiceInterface.kt index 371d48e062..713f1e90c1 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/RetrofitApiServiceInterface.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/RetrofitApiServiceInterface.kt @@ -1,6 +1,6 @@ /* * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 + * Contributors: denbond7 */ package com.flowcrypt.email.api.retrofit @@ -53,15 +53,17 @@ interface RetrofitApiServiceInterface { ): Response /** - * This method create a [Call] object for the API "https://flowcrypt.com/api/help/feedback" + * This method create a [Call] object for the API "https://https://flowcrypt.com/shared-tenant-fes/api/v1/account/feedback" + * + * ref https://github.com/FlowCrypt/flowcrypt-android/pull/2171#discussion_r1084124018 + * ref https://github.com/FlowCrypt/flowcrypt-android/issues/2827 * * @param body POJO model for requests * @return [<] */ - //@POST(BuildConfig.SHARED_TENANT_FES_URL + "help/feedback") - //ref https://github.com/FlowCrypt/flowcrypt-android/pull/2171#discussion_r1084124018 - @POST(BuildConfig.BACKEND_URL + "help/feedback") - suspend fun backendPostHelpFeedback(@Body body: PostHelpFeedbackModel): Response + @POST(BuildConfig.SHARED_TENANT_FES_URL + "api/v1/account/feedback") + suspend fun backendPostHelpFeedback(@Body body: PostHelpFeedbackModel): + Response /** * This method create a [Call] object for the API "https://flowcrypt.com/attester/pub" diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/SendFeedbackViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/SendFeedbackViewModel.kt index bd3b83cf3f..e4d6abf216 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/SendFeedbackViewModel.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/SendFeedbackViewModel.kt @@ -1,6 +1,6 @@ /* * © 2016-present FlowCrypt a.s. Limitations apply. Contact human@flowcrypt.com - * Contributors: DenBond7 + * Contributors: denbond7 */ package com.flowcrypt.email.jetpack.viewmodel @@ -41,7 +41,7 @@ class SendFeedbackViewModel(application: Application) : BaseAndroidViewModel(app postFeedbackMutableStateFlow.value = Result.loading(progressMsg = context.getString(R.string.sending)) val screenShotBase64 = - Base64.encodeToString(screenshot?.byteArray ?: byteArrayOf(), Base64.DEFAULT) + Base64.encodeToString(screenshot?.byteArray ?: byteArrayOf(), Base64.NO_WRAP) try { postFeedbackMutableStateFlow.value = ApiClientRepository.Backend.postHelpFeedback( 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 71e8e0324d..9318aad0de 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 @@ -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}" + textViewMsgsCount.text = folder.msgCount.takeIf { it > 0 }?.let { "$it" } menuItem.actionView = view } else { menuItem.actionView = null diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/FeedbackFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/FeedbackFragment.kt index b79cd34c94..073752e14e 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/FeedbackFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/FeedbackFragment.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 @@ -23,9 +23,9 @@ import androidx.navigation.fragment.navArgs import com.flowcrypt.email.R import com.flowcrypt.email.database.entity.AccountEntity import com.flowcrypt.email.databinding.FragmentFeedbackBinding -import com.flowcrypt.email.extensions.gone import com.flowcrypt.email.extensions.androidx.fragment.app.navController import com.flowcrypt.email.extensions.androidx.fragment.app.toast +import com.flowcrypt.email.extensions.gone import com.flowcrypt.email.extensions.visibleOrGone import com.flowcrypt.email.model.Screenshot import com.flowcrypt.email.ui.activity.fragment.base.BaseFragment diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/SendFeedbackDialogFragment.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/SendFeedbackDialogFragment.kt index 14333c3885..4565a6b3bb 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/SendFeedbackDialogFragment.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/dialog/SendFeedbackDialogFragment.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.dialog @@ -19,11 +19,11 @@ import com.flowcrypt.email.R import com.flowcrypt.email.api.retrofit.response.base.Result import com.flowcrypt.email.databinding.FragmentSendFeedbackDialogBinding import com.flowcrypt.email.extensions.androidx.fragment.app.countingIdlingResource +import com.flowcrypt.email.extensions.androidx.fragment.app.navController import com.flowcrypt.email.extensions.decrementSafely import com.flowcrypt.email.extensions.gone import com.flowcrypt.email.extensions.incrementSafely import com.flowcrypt.email.extensions.launchAndRepeatWithLifecycle -import com.flowcrypt.email.extensions.androidx.fragment.app.navController import com.flowcrypt.email.extensions.visible import com.flowcrypt.email.jetpack.viewmodel.SendFeedbackViewModel import com.flowcrypt.email.util.exception.ApiException @@ -83,7 +83,7 @@ class SendFeedbackDialogFragment : BaseDialogFragment() { navController?.navigateUp() setFragmentResult( args.requestKey, - bundleOf(KEY_RESULT to (it.data?.isSent == true)) + bundleOf(KEY_RESULT to true) ) countingIdlingResource?.decrementSafely(this@SendFeedbackDialogFragment) }