Fix settings & diagnose with embedded distrib

Signed-off-by: sim <git@sgougeon.fr>

Author: p1gp1g

app/src/main/java/com/nextcloud/talk/diagnosis/DiagnosisActivity.kt

@@ -80,6 +80,7 @@ class DiagnosisActivity : BaseActivity() {
     lateinit var platformPermissionUtil: PlatformPermissionUtil
 
     private var isGooglePlayServicesAvailable: Boolean = false
+    private var useEmbeddedDistrib: Boolean = false
 
     private var nUnifiedPushServices = 0
     private var offerUnifiedPush: Boolean = false
@@ -108,6 +109,7 @@ class DiagnosisActivity : BaseActivity() {
         offerUnifiedPush = nUnifiedPushServices > 0 &&
             userManager.users.blockingGet().all { it.hasWebPushCapability }
         useUnifiedPush = appPreferences.useUnifiedPush
+        useEmbeddedDistrib = UnifiedPushUtils.hasEmbeddedDistributor(context) && !useUnifiedPush
         unifiedPushService = UnifiedPush.getAckDistributor(this) ?: "N/A"
 
         setContent {
@@ -161,7 +163,9 @@ class DiagnosisActivity : BaseActivity() {
                                 viewState = viewState,
                                 onTestPushClick = { diagnosisViewModel.fetchTestPushResult() },
                                 onDismissDialog = { diagnosisViewModel.dismissDialog() },
-                                showTestPushButton = isGooglePlayServicesAvailable || useUnifiedPush,
+                                showTestPushButton = isGooglePlayServicesAvailable ||
+                                    useUnifiedPush ||
+                                    useEmbeddedDistrib,
                                 isOnline = isOnline
                             )
                         }
@@ -255,7 +259,7 @@ class DiagnosisActivity : BaseActivity() {
             value = Build.VERSION.SDK_INT.toString()
         )
 
-        if (isGooglePlayServicesAvailable) {
+        if (isGooglePlayServicesAvailable || useEmbeddedDistrib) {
             addDiagnosisEntry(
                 key = context.resources.getString(R.string.nc_diagnosis_gplay_available_title),
                 value = context.resources.getString(R.string.nc_diagnosis_gplay_available_yes)
@@ -302,7 +306,7 @@ class DiagnosisActivity : BaseActivity() {
             value = getStringForBoolean(useUnifiedPush)
         )
 
-        if (useUnifiedPush) {
+        if (useUnifiedPush || useEmbeddedDistrib) {
             setupAppValuesForPush()
             setupAppValuesForUnifiedPush()
         } else if (isGooglePlayServicesAvailable) {

app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt

@@ -387,7 +387,9 @@ class SettingsActivity :
     @SuppressLint("StringFormatInvalid")
     @Suppress("LongMethod")
     private fun setupNotificationPermissionSettings() {
-        if (ClosedInterfaceImpl().isGooglePlayServicesAvailable || appPreferences.useUnifiedPush) {
+        if (ClosedInterfaceImpl().isGooglePlayServicesAvailable ||
+            appPreferences.useUnifiedPush ||
+            UnifiedPushUtils.hasEmbeddedDistributor(context)) {
             binding.settingsPushOnlyWrapper.visibility = View.VISIBLE
             binding.settingsGplayNotAvailable.visibility = View.GONE
             binding.settingsPushNotAvailable.visibility = View.GONE