From f884c6c54d20426e34e1dcd843eb2ee39fefb0a9 Mon Sep 17 00:00:00 2001 From: Rafael da Veiga Cabral Date: Mon, 8 Jun 2020 18:42:33 -0300 Subject: [PATCH] [NY-10592]: [AN]: Check if there is connection for creating reports --- .../mvp/presenters/ReportAProblemPresenter.kt | 18 +++++++++--------- .../settings/ReportAProblemFragment.kt | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ReportAProblemPresenter.kt b/app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ReportAProblemPresenter.kt index dcd6b221a7..52731ff9e7 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ReportAProblemPresenter.kt +++ b/app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ReportAProblemPresenter.kt @@ -1,5 +1,6 @@ package com.nynja.mobile.communicator.mvp.presenters +import android.content.Context import android.os.Handler import com.arellomobile.mvp.InjectViewState import com.nynja.mobile.communicator.BuildConfig @@ -18,7 +19,6 @@ import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers import timber.log.Timber import java.io.File -import android.content.Context @InjectViewState @@ -29,16 +29,16 @@ class ReportAProblemPresenter : BasePresenter() { return arrayOf(Io::class.java) } - fun sendClick(description: String?, context: Context) { - if (StringUtils.isNotEmpty(description)) { + fun sendClick(context: Context, description: String?) = when { + StringUtils.isEmpty(description) -> DialogFactory.showAlert(context, R.string.report_a_problem_empty_description) + !NetworkUtil.isNetworkAvailable(context) -> DialogFactory.showAlert(context, R.string.intercom_no_network_connection) + else -> { Timber.e("\n=====================================================================\r\n" - + "### Problem Description: \n" - + description - + "\n" + Utils.getApplicationInfo() - + "\n=====================================================================\r\n") + + "### Problem Description: \n" + + description + + "\n" + Utils.getApplicationInfo() + + "\n=====================================================================\r\n") send() - }else { - DialogFactory.showAlert(context, R.string.report_a_problem_empty_description) } } diff --git a/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/settings/ReportAProblemFragment.kt b/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/settings/ReportAProblemFragment.kt index c3e4aa125d..e0cd52dc92 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/settings/ReportAProblemFragment.kt +++ b/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/settings/ReportAProblemFragment.kt @@ -51,7 +51,7 @@ class ReportAProblemFragment : BaseFragment(), ReportAProblemView { @OnClick(R.id.f_report_a_problem_btn_send) fun onSaveButtonClick() { - mPresenter.sendClick(description.text.toString().trim(), context) + mPresenter.sendClick(context, description.text.toString().trim()) } override fun showInternetError() { -- GitLab