ProtonMail
/
proton-mail-android
mirror of https://github.com/ProtonMail/proton-mail-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed popping no connectivity/connecting snackbar on MailboxAcitivty. 

MAILAND-999
This commit is contained in:
Tomasz Giszczak 2020-10-05 14:37:26 +02:00
parent e45eda9b1e
commit cb376d90b1
9 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/ch/protonmail/android/activities/BaseConnectivityActivity.kt
View File

@ -27,7 +27,7 @@ import butterknife.BindView
import ch.protonmail.android.R
import ch.protonmail.android.jobs.PingJob
import ch.protonmail.android.utils.INetworkConfiguratorCallback
import ch.protonmail.android.utils.NetworkUtil
import ch.protonmail.android.utils.NetworkSnackBarUtil
import com.google.android.material.snackbar.Snackbar
import com.google.android.material.snackbar.SnackbarContentLayout
import timber.log.Timber
@ -36,7 +36,7 @@ import javax.inject.Inject
abstract class BaseConnectivityActivity : BaseActivity() {
@Inject
lateinit var networkUtil : NetworkUtil
lateinit var networkSnackBarUtil : NetworkSnackBarUtil
@BindView(R.id.layout_no_connectivity_info)
protected lateinit var mSnackLayout: View
@ -51,7 +51,7 @@ abstract class BaseConnectivityActivity : BaseActivity() {
protected open inner class RetryListener : View.OnClickListener {
override fun onClick(v: View) {
mCheckForConnectivitySnack = networkUtil.setCheckingConnectionSnackLayout(
mCheckForConnectivitySnack = networkSnackBarUtil.getCheckingConnectionSnackBar(
mSnackLayout,
this@BaseConnectivityActivity
)
@ -84,7 +84,7 @@ abstract class BaseConnectivityActivity : BaseActivity() {
callback: INetworkConfiguratorCallback
) {
val user = mUserManager.user
mNoConnectivitySnack = mNoConnectivitySnack ?: networkUtil.setNoConnectionSnackLayout(
mNoConnectivitySnack = mNoConnectivitySnack ?: networkSnackBarUtil.getNoConnectionSnackBar(
view,
this,
listener ?: connectivityRetryListener,

3
app/src/main/java/ch/protonmail/android/activities/composeMessage/ComposeMessageActivity.java
View File

@ -163,7 +163,6 @@ import ch.protonmail.android.utils.Logger;
import ch.protonmail.android.utils.MailTo;
import ch.protonmail.android.utils.MailToUtils;
import ch.protonmail.android.utils.MessageUtils;
import ch.protonmail.android.utils.NetworkUtil;
import ch.protonmail.android.utils.ServerTime;
import ch.protonmail.android.utils.UiUtil;
import ch.protonmail.android.utils.crypto.TextDecryptionResult;
@ -804,7 +803,7 @@ public class ComposeMessageActivity
@Override
public void onClick(View v) {
mNetworkUtil.setCurrentlyHasConnectivity(true);
Snackbar mCheckForConnectivitySnack = networkUtil.setCheckingConnectionSnackLayout(getMSnackLayout(), ComposeMessageActivity.this);
Snackbar mCheckForConnectivitySnack = networkSnackBarUtil.getCheckingConnectionSnackBar(getMSnackLayout(), ComposeMessageActivity.this);
mCheckForConnectivitySnack.show();
super.onClick(v);
}

2
app/src/main/java/ch/protonmail/android/activities/guest/CreateAccountActivity.java
View File

@ -625,7 +625,7 @@ public class CreateAccountActivity extends BaseConnectivityActivity implements
@Override
public void onClick(View v) {
mNetworkUtil.setCurrentlyHasConnectivity(true);
mCheckForConnectivitySnack = networkUtil.setCheckingConnectionSnackLayout(
mCheckForConnectivitySnack = networkSnackBarUtil.getCheckingConnectionSnackBar(
getMSnackLayout(), CreateAccountActivity.this);
mCheckForConnectivitySnack.show();
checkDirectEnabled();

2
app/src/main/java/ch/protonmail/android/activities/guest/LoginActivity.java
View File

@ -194,7 +194,7 @@ public class LoginActivity extends BaseLoginActivity {
@Override
public void onClick(View v) {
mNetworkUtil.setCurrentlyHasConnectivity(true);
mCheckForConnectivitySnack = networkUtil.setCheckingConnectionSnackLayout(
mCheckForConnectivitySnack = networkSnackBarUtil.getCheckingConnectionSnackBar(
getMSnackLayout(), LoginActivity.this);
mCheckForConnectivitySnack.show();
onSignIn();

2
app/src/main/java/ch/protonmail/android/activities/guest/MailboxLoginActivity.java
View File

@ -179,7 +179,7 @@ public class MailboxLoginActivity extends BaseLoginActivity {
@Override
public void onClick(View v) {
mNetworkUtil.setCurrentlyHasConnectivity(true);
mCheckForConnectivitySnack = networkUtil.setCheckingConnectionSnackLayout(getMSnackLayout(), MailboxLoginActivity.this);
mCheckForConnectivitySnack = networkSnackBarUtil.getCheckingConnectionSnackBar(getMSnackLayout(), MailboxLoginActivity.this);
mCheckForConnectivitySnack.show();
super.onClick(v);
}

56
app/src/main/java/ch/protonmail/android/activities/mailbox/MailboxActivity.kt
View File

@ -33,12 +33,12 @@ import android.net.Uri
import android.os.AsyncTask
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.view.ActionMode
import android.view.Gravity
import android.view.Menu
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import android.view.WindowManager
import android.widget.AbsListView.MultiChoiceModeListener
import android.widget.TextView
@ -165,7 +165,7 @@ import ch.protonmail.android.usecase.delete.DeleteMessage
import ch.protonmail.android.utils.AppUtil
import ch.protonmail.android.utils.Event
import ch.protonmail.android.utils.MessageUtils
import ch.protonmail.android.utils.NetworkUtil
import ch.protonmail.android.utils.NetworkSnackBarUtil
import ch.protonmail.android.utils.UiUtil
import ch.protonmail.android.utils.extensions.app
import ch.protonmail.android.utils.extensions.showToast
@ -191,6 +191,7 @@ import java.lang.ref.WeakReference
import java.util.UUID
import java.util.concurrent.atomic.AtomicBoolean
import javax.inject.Inject
import kotlin.time.seconds
// region constants
private const val TAG_MAILBOX_ACTIVITY = "MailboxActivity"
@ -231,10 +232,7 @@ class MailboxActivity :
lateinit var sendPing: SendPing
@Inject
lateinit var networkUtil: NetworkUtil
private var noConnectivitySnack: Snackbar? = null
private var checkForConnectivitySnack: Snackbar? = null
lateinit var networkSnackBarUtil: NetworkSnackBarUtil
private lateinit var messagesAdapter: MessagesRecyclerViewAdapter
private val mailboxLocationMain = MutableLiveData<MessageLocationType>()
@ -251,6 +249,7 @@ class MailboxActivity :
private lateinit var mailboxViewModel: MailboxViewModel
private var storageLimitApproachingAlertDialog: AlertDialog? = null
private var liveSharedPreferences: LiveSharedPreferences? = null
private val handler = Handler(Looper.getMainLooper())
override val currentLabelId get() = mailboxLabelId
@ -632,7 +631,7 @@ class MailboxActivity :
setUpDrawer()
setupAccountsList()
checkRegistration()
Handler().postDelayed(
handler.postDelayed(
{
mJobManager.addJobInBackground(FetchLabelsJob())
setupNewMessageLocation(DrawerOptionType.INBOX.drawerOptionTypeValue)
@ -714,15 +713,19 @@ class MailboxActivity :
}
private var connectivityRetryListener = View.OnClickListener {
mConnectivitySnackLayout?.let {
networkSnackBarUtil.getCheckingConnectionSnackBar(it, this).show()
}
retryConnection()
}
private fun retryConnection() {
Timber.v("retryConnection")
mNetworkUtil.setCurrentlyHasConnectivity(true)
mailboxViewModel.launchPing()
mConnectivitySnackLayout?.let {
checkForConnectivitySnack = networkUtil.setCheckingConnectionSnackLayout(it, this)
checkForConnectivitySnack?.show()
}
syncUUID = UUID.randomUUID().toString()
if (mNetworkUtil.isConnected()) {
Handler().postDelayed(FetchMessagesRetryRunnable(this), 3000)
handler.postDelayed(FetchMessagesRetryRunnable(this), 3000)
val thirdPartyConnectionsEnabled = mUserManager.user.allowSecureConnectionsViaThirdParties
if (thirdPartyConnectionsEnabled) {
networkConfigurator.refreshDomainsAsync()
@ -1052,29 +1055,30 @@ class MailboxActivity :
}
private fun showNoConnSnack() {
Timber.v("showNoConnSnack")
mConnectivitySnackLayout?.let {
noConnectivitySnack = networkUtil.setNoConnectionSnackLayout(
val noConnectivitySnackBar = networkSnackBarUtil.getNoConnectionSnackBar(
snackBarLayout = it,
context = this,
listener = connectivityRetryListener,
user = mUserManager.user,
callback = this
)
noConnectivitySnackBar.show()
}
val contentLayout = (noConnectivitySnack!!.view as ViewGroup).getChildAt(0) as SnackbarContentLayout
noConnectivitySnack?.show()
if (mUserManager.user.allowSecureConnectionsViaThirdParties && autoRetry && !isDohOngoing && !isFinishing) {
window.decorView.postDelayed({ contentLayout.actionView.callOnClick() }, 500)
handler.postDelayed(
{ retryConnection() },
5.seconds.toLongMilliseconds()
)
}
}
private fun hideNoConnSnack() {
if (noConnectivitySnack != null) {
if (checkForConnectivitySnack != null) {
checkForConnectivitySnack!!.dismiss()
}
noConnectivitySnack!!.dismiss()
}
Timber.v("hideNoConnSnack")
networkSnackBarUtil.hideCheckingConnectionSnakBar()
networkSnackBarUtil.hideNoConnectionSnakBar()
}
@Subscribe
@ -1176,7 +1180,7 @@ class MailboxActivity :
setRefreshing(false)
}
fun onConnectivityEvent(hasConnection: Boolean) {
private fun onConnectivityEvent(hasConnection: Boolean) {
Timber.d("onConnectivityEvent hasConnection: $hasConnection")
if (!isDohOngoing) {
Timber.d("DoH NOT ongoing showing UI")
@ -1675,7 +1679,7 @@ class MailboxActivity :
when (requestCode) {
REQUEST_CODE_TRASH_MESSAGE_DETAILS -> {
move_to_trash.visibility = View.VISIBLE
Handler().postDelayed({ move_to_trash.visibility = View.GONE }, 1000)
handler.postDelayed({ move_to_trash.visibility = View.GONE }, 1000)
}
REQUEST_CODE_VALIDATE_PIN -> {
if (data!!.hasExtra(EXTRA_TOTAL_COUNT_EVENT)) {
@ -1920,7 +1924,7 @@ class MailboxActivity :
syncUUID = UUID.randomUUID().toString()
checkUserAndFetchNews()
if ((messages_list_view.layoutManager as LinearLayoutManager?)!!.findFirstVisibleItemPosition() > 1) {
Handler().postDelayed(
handler.postDelayed(
{
val newMessageSnack =
Snackbar.make(
@ -2013,7 +2017,7 @@ class MailboxActivity :
undoSnack!!.show()
}
if (swipeCustomizeSnack != null && !customizeSwipeSnackShown) {
Handler().postDelayed(
handler.postDelayed(
{
swipeCustomizeSnack!!.show()
customizeSwipeSnackShown = true

2
app/src/main/java/ch/protonmail/android/contacts/ContactsActivity.kt
View File

@ -192,7 +192,7 @@ class ContactsActivity :
override fun onClick(v: View) {
super.onClick(v)
mNetworkUtil.setCurrentlyHasConnectivity(true)
mCheckForConnectivitySnack = networkUtil.setCheckingConnectionSnackLayout(
mCheckForConnectivitySnack = networkSnackBarUtil.getCheckingConnectionSnackBar(
layout_no_connectivity_info,
this@ContactsActivity
)

2
app/src/main/java/ch/protonmail/android/core/QueueNetworkUtil.kt
View File

@ -42,7 +42,7 @@ class QueueNetworkUtil @Inject constructor(
private var isInternetAccessible: Boolean = false
@Synchronized
fun updateRealConnectivity(internetAccessible: Boolean) {
private fun updateRealConnectivity(internetAccessible: Boolean) {
isInternetAccessible = internetAccessible
}

13
app/src/main/java/ch/protonmail/android/utils/NetworkUtil.kt → app/src/main/java/ch/protonmail/android/utils/NetworkSnackBarUtil.kt
View File

@ -35,21 +35,22 @@ import ch.protonmail.android.R
import ch.protonmail.android.api.models.User
import ch.protonmail.android.utils.ui.dialogs.DialogUtils.Companion.showInfoDialogWithCustomView
import com.google.android.material.snackbar.Snackbar
import timber.log.Timber
import javax.inject.Inject
import javax.inject.Singleton
/**
* Utility methods for displaying network error seacoasts.
* Utility methods for displaying network error snackbars.
*
* Defined as Singleton in order to be able to determine if a given snackbar instance is still displayed.
*/
@Singleton
class NetworkUtil @Inject constructor() {
class NetworkSnackBarUtil @Inject constructor() {
private var noConnectionSnackBar: Snackbar? = null
private var checkingConnectionSnackBar: Snackbar? = null
fun setNoConnectionSnackLayout(
fun getNoConnectionSnackBar(
snackBarLayout: View,
context: Context,
listener: View.OnClickListener?,
@ -78,7 +79,7 @@ class NetworkUtil @Inject constructor() {
return snackbar
}
fun setCheckingConnectionSnackLayout(
fun getCheckingConnectionSnackBar(
snackBarLayout: View,
context: Context
): Snackbar {
@ -100,8 +101,12 @@ class NetworkUtil @Inject constructor() {
fun isNoConnectionShown() = noConnectionSnackBar?.isShownOrQueued ?: false
fun hideNoConnectionSnakBar() = noConnectionSnackBar?.dismiss()
fun isCheckingConnectionShown() = checkingConnectionSnackBar?.isShownOrQueued ?: false
fun hideCheckingConnectionSnakBar() = checkingConnectionSnackBar?.dismiss()
private fun showNoConnectionTroubleshootDialog(
context: Context,
user: User,