Merge pull request #3496 from dhis2/ANDROAPP-5658

andresmr · web-flow · commit 2f3b422ad9ab · 2024-02-14T15:50:33.000+01:00
fix: [ANDROAPP-5658] Shows snackbar when user does not have connection when trying to sync
diff --git a/app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/DataSetTableActivity.kt b/app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/DataSetTableActivity.kt
@@ -172,6 +172,14 @@ class DataSetTableActivity : ActivityGlobalAbstract(), DataSetTableContract.View
                     if (hasChanged) presenter.updateData()
                 }
             })
+            .onNoConnectionListener {
+                val contextView = findViewById<View>(R.id.navigationBar)
+                Snackbar.make(
+                    contextView,
+                    R.string.sync_offline_check_connection,
+                    Snackbar.LENGTH_SHORT,
+                ).show()
+            }
             .show(DATAVALUE_SYNC)
     }
 
diff --git a/app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/DataSetDetailActivity.java b/app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/DataSetDetailActivity.java
@@ -16,6 +16,8 @@
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
 
+import com.google.android.material.snackbar.Snackbar;
+
 import org.dhis2.App;
 import org.dhis2.R;
 import org.dhis2.bindings.ExtensionsKt;
@@ -26,6 +28,7 @@
 import org.dhis2.commons.filters.FiltersAdapter;
 import org.dhis2.commons.orgunitselector.OUTreeFragment;
 import org.dhis2.commons.sync.ConflictType;
+import org.dhis2.commons.sync.OnNoConnectionListener;
 import org.dhis2.databinding.ActivityDatasetDetailBinding;
 import org.dhis2.ui.ThemeManager;
 import org.dhis2.usescases.datasets.datasetDetail.datasetList.DataSetListFragment;
@@ -240,10 +243,18 @@ public void setProgress(boolean active) {
     @Override
     public void showGranularSync() {
         presenter.trackDataSetGranularSync();
+        View contextView = findViewById(R.id.navigationBar);
         new SyncStatusDialog.Builder()
                 .withContext(this, null)
                 .withSyncContext(new SyncContext.DataSet(dataSetUid))
                 .onDismissListener(hasChanged -> presenter.refreshList())
+                .onNoConnectionListener(() ->
+                    Snackbar.make(
+                        contextView,
+                        R.string.sync_offline_check_connection,
+                        Snackbar.LENGTH_SHORT
+                    ).show()
+                )
                 .show("DATASET_SYNC");
     }
 }
diff --git a/app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/datasetList/DataSetListFragment.kt b/app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/datasetList/DataSetListFragment.kt
@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.viewModels
+import com.google.android.material.snackbar.Snackbar
 import org.dhis2.R
 import org.dhis2.commons.Constants
 import org.dhis2.commons.sync.OnDismissListener
@@ -132,7 +133,16 @@ class DataSetListFragment : FragmentGlobalAbstract() {
                         viewModel.updateData()
                     }
                 }
-            }).show(FRAGMENT_TAG)
+            })
+            .onNoConnectionListener {
+                val contextView = activity.findViewById<View>(R.id.navigationBar)
+                Snackbar.make(
+                    contextView,
+                    R.string.sync_offline_check_connection,
+                    Snackbar.LENGTH_SHORT,
+                ).show()
+            }
+            .show(FRAGMENT_TAG)
     }
 
     companion object {
diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.kt
@@ -444,6 +444,14 @@ class EventCaptureActivity :
         SyncStatusDialog.Builder()
             .withContext(this)
             .withSyncContext(SyncContext.Event(eventUid!!))
+            .onNoConnectionListener {
+                val contextView = findViewById<View>(R.id.navigationBar)
+                Snackbar.make(
+                    contextView,
+                    R.string.sync_offline_check_connection,
+                    Snackbar.LENGTH_SHORT,
+                ).show()
+            }
             .show("EVENT_SYNC")
     }
 
diff --git a/app/src/main/java/org/dhis2/usescases/main/MainActivity.kt b/app/src/main/java/org/dhis2/usescases/main/MainActivity.kt
@@ -22,6 +22,7 @@ import androidx.core.view.ViewCompat
 import androidx.databinding.DataBindingUtil
 import androidx.drawerlayout.widget.DrawerLayout
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.snackbar.Snackbar
 import org.dhis2.BuildConfig
 import org.dhis2.R
 import org.dhis2.bindings.app
@@ -304,6 +305,14 @@ class MainActivity :
                     }
                 },
             )
+            .onNoConnectionListener {
+                val contextView = findViewById<View>(R.id.navigationBar)
+                Snackbar.make(
+                    contextView,
+                    R.string.sync_offline_check_connection,
+                    Snackbar.LENGTH_SHORT,
+                ).show()
+            }
             .show("ALL_SYNC")
     }
 
diff --git a/app/src/main/java/org/dhis2/usescases/main/program/ProgramFragment.kt b/app/src/main/java/org/dhis2/usescases/main/program/ProgramFragment.kt
@@ -16,6 +16,7 @@ import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.core.view.ViewCompat
 import androidx.databinding.DataBindingUtil
+import com.google.android.material.snackbar.Snackbar
 import org.dhis2.App
 import org.dhis2.R
 import org.dhis2.android.rtsm.commons.Constants.INTENT_EXTRA_APP_CONFIG
@@ -220,7 +221,16 @@ class ProgramFragment : FragmentGlobalAbstract(), ProgramView {
                         }
                     }
                 },
-            ).show(FRAGMENT_TAG)
+            )
+            .onNoConnectionListener {
+                val contextView = activity?.findViewById<View>(R.id.navigationBar)
+                Snackbar.make(
+                    contextView!!,
+                    R.string.sync_offline_check_connection,
+                    Snackbar.LENGTH_SHORT,
+                ).show()
+            }
+            .show(FRAGMENT_TAG)
     }
 
     fun sharedView() = binding.drawerLayout
diff --git a/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailActivity.kt b/app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailActivity.kt
@@ -12,6 +12,7 @@ import androidx.activity.viewModels
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.databinding.DataBindingUtil
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.snackbar.Snackbar
 import dhis2.org.analytics.charts.ui.GroupAnalyticsFragment
 import org.dhis2.R
 import org.dhis2.bindings.app
@@ -195,7 +196,16 @@ class ProgramEventDetailActivity :
                 override fun onDismiss(hasChanged: Boolean) {
                     if (hasChanged) FilterManager.getInstance().publishData()
                 }
-            }).show("EVENT_SYNC")
+            })
+            .onNoConnectionListener {
+                val contextView = findViewById<View>(R.id.navigationBar)
+                Snackbar.make(
+                    contextView,
+                    R.string.sync_offline_check_connection,
+                    Snackbar.LENGTH_SHORT,
+                ).show()
+            }
+            .show("EVENT_SYNC")
     }
 
     public override fun onPause() {
@@ -376,7 +386,16 @@ class ProgramEventDetailActivity :
                 override fun onDismiss(hasChanged: Boolean) {
                     if (hasChanged) FilterManager.getInstance().publishData()
                 }
-            }).show(FRAGMENT_TAG)
+            })
+            .onNoConnectionListener {
+                val contextView = findViewById<View>(R.id.rootView)
+                Snackbar.make(
+                    contextView,
+                    R.string.sync_offline_check_connection,
+                    Snackbar.LENGTH_SHORT,
+                ).show()
+            }
+            .show(FRAGMENT_TAG)
     }
 
     private fun showList() {
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEActivity.java b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/SearchTEActivity.java
@@ -332,14 +332,23 @@ protected void onSaveInstanceState(@NonNull Bundle outState) {
     }
 
     private void openSyncDialog() {
+        View contextView = findViewById(R.id.navigationBar);
         new SyncStatusDialog.Builder()
                 .withContext(this, null)
                 .withSyncContext(
                         new SyncContext.TrackerProgram(initialProgram)
                 )
                 .onDismissListener(hasChanged -> {
                     if (hasChanged) viewModel.refreshData();
-                }).show("PROGRAM_SYNC");
+                })
+                .onNoConnectionListener(() ->
+                    Snackbar.make(
+                        contextView,
+                        R.string.sync_offline_check_connection,
+                        Snackbar.LENGTH_SHORT
+                    ).show()
+                )
+                .show("PROGRAM_SYNC");
     }
 
     @Override
@@ -582,14 +591,22 @@ public void setPrograms(List<ProgramSpinnerModel> programs) {
 
     @Override
     public void showSyncDialog(String enrollmentUid) {
+        View contextView = findViewById(R.id.navigationBar);
         new SyncStatusDialog.Builder()
                 .withContext(this, null)
                 .withSyncContext(
                         new SyncContext.TrackerProgramTei(enrollmentUid)
                 )
                 .onDismissListener(hasChanged -> {
                     if (hasChanged) viewModel.refreshData();
-                }).show("TEI_SYNC");
+                })
+                .onNoConnectionListener(() ->
+                    Snackbar.make(
+                            contextView,
+                            R.string.sync_offline_check_connection,
+                            Snackbar.LENGTH_SHORT
+                    ).show()
+                ).show("TEI_SYNC");
     }
 
     private void setInitialProgram(List<ProgramSpinnerModel> programs) {
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt
@@ -21,6 +21,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModelProvider
 import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.snackbar.Snackbar
 import org.dhis2.App
 import org.dhis2.R
 import org.dhis2.commons.Constants
@@ -302,7 +303,15 @@ class TeiDashboardMobileActivity :
                             finish()
                         }
                     }
-                }).show(TEI_SYNC)
+                })
+                .onNoConnectionListener {
+                    val contextView = findViewById<View>(R.id.navigationBar)
+                    Snackbar.make(
+                        contextView,
+                        R.string.sync_offline_check_connection,
+                        Snackbar.LENGTH_SHORT,
+                    ).show()
+                }.show(TEI_SYNC)
         }
     }
 
diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt
@@ -18,6 +18,7 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CircleCrop
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
+import com.google.android.material.snackbar.Snackbar
 import io.reactivex.Flowable
 import io.reactivex.Single
 import io.reactivex.functions.Consumer
@@ -619,7 +620,15 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
                 override fun onDismiss(hasChanged: Boolean) {
                     if (hasChanged) FilterManager.getInstance().publishData()
                 }
-            }).show(enrollmentUid)
+            })
+            .onNoConnectionListener {
+                val contextView = activity?.findViewById<View>(R.id.navigationBar)
+                Snackbar.make(
+                    contextView!!,
+                    R.string.sync_offline_check_connection,
+                    Snackbar.LENGTH_SHORT,
+                ).show()
+            }.show(enrollmentUid)
     }
 
     override fun displayCatComboOptionSelectorForEvents(data: List<EventViewModel>) {
diff --git a/app/src/main/java/org/dhis2/utils/granularsync/SyncStatusDialog.kt b/app/src/main/java/org/dhis2/utils/granularsync/SyncStatusDialog.kt
@@ -32,6 +32,7 @@ import org.dhis2.bindings.showSMS
 import org.dhis2.commons.date.toDateSpan
 import org.dhis2.commons.network.NetworkUtils
 import org.dhis2.commons.sync.OnDismissListener
+import org.dhis2.commons.sync.OnNoConnectionListener
 import org.dhis2.commons.sync.OnSyncNavigationListener
 import org.dhis2.commons.sync.SyncContext
 import org.dhis2.commons.ui.icons.SyncStateIcon
@@ -69,6 +70,8 @@ class SyncStatusDialog : BottomSheetDialogFragment(), GranularSyncContracts.View
 
     private val viewModel: GranularSyncPresenter by viewModels { viewModelFactory }
 
+    var onNoConnectionListener: OnNoConnectionListener? = null
+
     override fun onAttach(context: Context) {
         super.onAttach(context)
         (context.applicationContext as App).serverComponent()!!.plus(
@@ -172,9 +175,16 @@ class SyncStatusDialog : BottomSheetDialogFragment(), GranularSyncContracts.View
             networkUtils.isOnline() -> syncGranular()
             viewModel.canSendSMS() &&
                 viewModel.isSMSEnabled(context?.showSMS() == true) -> syncSms()
+            !networkUtils.isOnline() &&
+                !viewModel.isSMSEnabled(context?.showSMS() == true) -> showSnackbar()
         }
     }
 
+    private fun showSnackbar() {
+        dismiss()
+        onNoConnectionListener?.onNoConnection()
+    }
+
     private fun syncGranular() {
         syncing = true
         viewModel.initGranularSync().observe(
@@ -335,6 +345,7 @@ class SyncStatusDialog : BottomSheetDialogFragment(), GranularSyncContracts.View
         private var navigator: SyncStatusDialogNavigator? = null
         private lateinit var syncContext: SyncContext
         private var dismissListener: OnDismissListener? = null
+        private var noConnectionListener: OnNoConnectionListener? = null
 
         fun withContext(
             context: FragmentActivity,
@@ -372,12 +383,18 @@ class SyncStatusDialog : BottomSheetDialogFragment(), GranularSyncContracts.View
             return this
         }
 
+        fun onNoConnectionListener(noConnectionListener: OnNoConnectionListener): Builder {
+            this.noConnectionListener = noConnectionListener
+            return this
+        }
+
         private fun build(): SyncStatusDialog {
             return SyncStatusDialog().apply {
                 arguments = Bundle().apply {
                     putParcelable(SYNC_CONTEXT, syncContext)
                 }
                 dismissListenerDialog = dismissListener
+                onNoConnectionListener = noConnectionListener
                 syncStatusDialogNavigator = navigator
             }
         }
diff --git a/app/src/main/java/org/dhis2/utils/granularsync/SyncStatusDialogProvider.kt b/app/src/main/java/org/dhis2/utils/granularsync/SyncStatusDialogProvider.kt
@@ -2,6 +2,7 @@ package org.dhis2.utils.granularsync
 
 import androidx.fragment.app.FragmentActivity
 import org.dhis2.commons.sync.OnDismissListener
+import org.dhis2.commons.sync.OnNoConnectionListener
 import org.dhis2.commons.sync.OnSyncNavigationListener
 import org.dhis2.commons.sync.SyncComponentProvider
 import org.dhis2.commons.sync.SyncContext
@@ -13,13 +14,15 @@ class SyncStatusDialogProvider : SyncComponentProvider {
         syncContext: SyncContext,
         dismissListener: OnDismissListener?,
         onSyncNavigationListener: OnSyncNavigationListener?,
+        onNoConnectionListener: OnNoConnectionListener?,
     ) {
         val syncBuilder = SyncStatusDialog.Builder()
             .withContext(activity, onSyncNavigationListener)
             .withSyncContext(syncContext)
 
         with(syncBuilder) {
             dismissListener?.let { onDismissListener(it) }
+            onNoConnectionListener?.let { onNoConnectionListener(it) }
         }
         syncBuilder
             .show(syncContext.conflictType().name)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -963,6 +963,7 @@
     <string name="remove">Remove</string>
     <string name="coordinates">Coordinates</string>
     <string name="no_data_access">You don’t have access to data.\nContact your administrator.</string>
+    <string name="sync_offline_check_connection">Looks like you\'re offline. Please check you connection</string>
     <string name="delete_tei_dialog_title">Delete this %s?</string>
     <string name="delete_tei_dialog_message">This %s and all its data across all programs will be deleted. This action cannot be undone.</string>
     <string name="remove_enrollment_dialog_title">Remove from %s?</string>
diff --git a/commons/src/main/java/org/dhis2/commons/sync/OnNoConnectionListener.kt b/commons/src/main/java/org/dhis2/commons/sync/OnNoConnectionListener.kt
@@ -0,0 +1,5 @@
+package org.dhis2.commons.sync
+
+fun interface OnNoConnectionListener {
+    fun onNoConnection()
+}
diff --git a/commons/src/main/java/org/dhis2/commons/sync/SyncComponentProvider.kt b/commons/src/main/java/org/dhis2/commons/sync/SyncComponentProvider.kt
@@ -8,5 +8,6 @@ interface SyncComponentProvider {
         syncContext: SyncContext,
         dismissListener: OnDismissListener? = null,
         onSyncNavigationListener: OnSyncNavigationListener? = null,
+        onNoConnectionListener: OnNoConnectionListener? = null,
     )
 }
diff --git a/commons/src/main/java/org/dhis2/commons/sync/SyncDialog.kt b/commons/src/main/java/org/dhis2/commons/sync/SyncDialog.kt

Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,14 @@ class DataSetTableActivity : ActivityGlobalAbstract(), DataSetTableContract.View`
`172`	`172`	`if (hasChanged) presenter.updateData()`
`173`	`173`	`}`
`174`	`174`	`})`
	`175`	`+ .onNoConnectionListener {`
	`176`	`+ val contextView = findViewById<View>(R.id.navigationBar)`
	`177`	`+ Snackbar.make(`
	`178`	`+ contextView,`
	`179`	`+ R.string.sync_offline_check_connection,`
	`180`	`+ Snackbar.LENGTH_SHORT,`
	`181`	`+ ).show()`
	`182`	`+ }`
`175`	`183`	`.show(DATAVALUE_SYNC)`
`176`	`184`	`}`
`177`	`185`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import androidx.lifecycle.LiveData`
`21`	`21`	`import androidx.lifecycle.MutableLiveData`
`22`	`22`	`import androidx.lifecycle.ViewModelProvider`
`23`	`23`	`import androidx.viewpager2.widget.ViewPager2`
	`24`	`+import com.google.android.material.snackbar.Snackbar`
`24`	`25`	`import org.dhis2.App`
`25`	`26`	`import org.dhis2.R`
`26`	`27`	`import org.dhis2.commons.Constants`
`@@ -302,7 +303,15 @@ class TeiDashboardMobileActivity :`
`302`	`303`	`finish()`
`303`	`304`	`}`
`304`	`305`	`}`
`305`		`- }).show(TEI_SYNC)`
	`306`	`+ })`
	`307`	`+ .onNoConnectionListener {`
	`308`	`+ val contextView = findViewById<View>(R.id.navigationBar)`
	`309`	`+ Snackbar.make(`
	`310`	`+ contextView,`
	`311`	`+ R.string.sync_offline_check_connection,`
	`312`	`+ Snackbar.LENGTH_SHORT,`
	`313`	`+ ).show()`
	`314`	`+ }.show(TEI_SYNC)`
`306`	`315`	`}`
`307`	`316`	`}`
`308`	`317`