fix: Status notification warning popup (#2126)

makingthematrix · web-flow · commit a04822f16972 · 2019-05-10T18:00:04.000+02:00
Refactoring of warning/confirmation popups.
The status notification warning popup appears when the user launches the app after upgrading.
The gradle file is changed for easier handling of '-PR', '-SNAPSHOT' and '-DEV' sync engine injections.
diff --git a/app/build.gradle b/app/build.gradle
@@ -22,7 +22,7 @@ ext {
     playServicesVersion = '15.0.1'
     audioVersion = System.getenv("AUDIO_VERSION") ?: '1.209.0@aar'
     stethoVersion = '1.5.0'
-    zMessagingVersion = "141.0.2273"
+    zMessagingVersion = "141.0.2275"
     paging_version = "1.0.0"
 
     avsVersion = '4.9.170@aar'
@@ -36,7 +36,17 @@ ext {
     customAvsName = 'avs'
     customAvsGroup = 'com.wearezeta.avs'
 
-    zMessagingDevVersion = System.getenv("LOCAL_ZMESSAGING_VERSION") ?: ((System.getenv("ZMESSAGING_VERSION") ?: zMessagingVersion) + '-DEV')
+    zMessagingDevVersion = ''
+    if (System.getenv("LOCAL_ZMESSAGING_VERSION") != null) {
+        zMessagingDevVersion = System.getenv("LOCAL_ZMESSAGING_VERSION")
+    } else if (System.getenv("ZMESSAGING_VERSION") != null) {
+        zMessagingDevVersion = System.getenv("ZMESSAGING_VERSION")
+    } else if (zMessagingVersion.endsWith("-PR") || zMessagingVersion.endsWith("-SNAPSHOT")) {
+        zMessagingDevVersion = zMessagingVersion
+    } else {
+        zMessagingDevVersion = zMessagingVersion + "-DEV"
+    }
+
     zMessagingReleaseVersion = System.getenv("LOCAL_ZMESSAGING_VERSION") ?: ((System.getenv("ZMESSAGING_VERSION") ?: zMessagingVersion) + '@aar')
 
 }
diff --git a/app/src/main/scala/com/waz/zclient/MainActivity.scala b/app/src/main/scala/com/waz/zclient/MainActivity.scala
@@ -143,23 +143,34 @@ class MainActivity extends BaseActivity
     }
 
     for {
-      Some(user) <- userAccountsController.currentUser.head
-      teamName   <- user.teamId.fold(Future.successful(Option.empty[Name]))(teamId => inject[TeamsStorage].get(teamId).map(_.map(_.name)))
+      Some(self) <- userAccountsController.currentUser.head
+      teamName   <- self.teamId.fold(
+                      Future.successful(Option.empty[Name])
+                    )(teamId =>
+                      inject[TeamsStorage].get(teamId).map(_.map(_.name))
+                    )
       prefs      <- userPreferences.head
       shouldWarn <- prefs(UserPreferences.ShouldWarnStatusNotifications).apply()
       avVisible  <- usersController.availabilityVisible.head
+      color      <- accentColorController.accentColor.head
     } yield {
-      (shouldWarn && avVisible, user.availability, teamName) match {
+      (shouldWarn && avVisible, self.availability, teamName) match {
         case (true, Availability.Away, Some(name)) =>
           inject[MessageNotificationsController].showAppNotification(
             ResString(R.string.availability_notification_blocked_title, name.str),
             ResString(R.string.availability_notification_blocked)
           )
+          showStatusNotificationWarning(self.availability, color).foreach { dontShowAgain =>
+            if (dontShowAgain) prefs(UserPreferences.StatusNotificationsBitmask).mutate(_ | self.availability.bitmask)
+          }
         case (true, Availability.Busy, Some(name)) =>
           inject[MessageNotificationsController].showAppNotification(
             ResString(R.string.availability_notification_changed_title, name.str),
             ResString(R.string.availability_notification_changed)
           )
+          showStatusNotificationWarning(self.availability, color).foreach { dontShowAgain =>
+            if (dontShowAgain) prefs(UserPreferences.StatusNotificationsBitmask).mutate(_ | self.availability.bitmask)
+          }
         case _ =>
       }
       if (shouldWarn) prefs(UserPreferences.ShouldWarnStatusNotifications) := false
diff --git a/app/src/main/scala/com/waz/zclient/appentry/AppEntryActivity.scala b/app/src/main/scala/com/waz/zclient/appentry/AppEntryActivity.scala
@@ -169,10 +169,11 @@ class AppEntryActivity extends BaseActivity {
 
         inject[AccentColorController].accentColor.head.flatMap { color =>
           showConfirmationDialog(
-            title = ContextUtils.getString(R.string.custom_backend_dialog_confirmation_title),
-            msg = ContextUtils.getString(R.string.custom_backend_dialog_confirmation_message, configUrl.toString),
+            title       = ContextUtils.getString(R.string.custom_backend_dialog_confirmation_title),
+            msg         = ContextUtils.getString(R.string.custom_backend_dialog_confirmation_message, configUrl.toString),
             positiveRes = R.string.custom_backend_dialog_connect,
-            accentColor = Some(color)
+            negativeRes = android.R.string.cancel,
+            color       = color
           )
         }.foreach {
         case false =>
diff --git a/app/src/main/scala/com/waz/zclient/appentry/SSOFragment.scala b/app/src/main/scala/com/waz/zclient/appentry/SSOFragment.scala
@@ -111,8 +111,8 @@ trait SSOFragment extends FragmentHelper with DerivedLogTag {
             inject[AccentColorController].accentColor.head.flatMap { color =>
               showConfirmationDialog(
                 title = getString(R.string.sso_signin_error_title),
-                msg = getString(R.string.sso_signin_error_try_again_message, error.code.toString),
-                accentColor = Some(color)
+                msg   = getString(R.string.sso_signin_error_try_again_message, error.code.toString),
+                color = color
               )
             }.map(_ => ())
         }
diff --git a/app/src/main/scala/com/waz/zclient/appentry/fragments/VerifyEmailWithCodeFragment.scala b/app/src/main/scala/com/waz/zclient/appentry/fragments/VerifyEmailWithCodeFragment.scala
@@ -185,13 +185,13 @@ class VerifyEmailWithCodeFragment extends FragmentHelper with View.OnClickListen
       _                   <- resp match {
         case Right(Some(am)) =>
           (if (!askMarketingConsent) Future.successful(Some(false)) else
-            showConfirmationDialogWithNeutralButton(
-              R.string.receive_news_and_offers_request_title,
-              R.string.receive_news_and_offers_request_body,
-              R.string.app_entry_dialog_privacy_policy,
+            showConfirmationDialog(
+              getString(R.string.receive_news_and_offers_request_title),
+              getString(R.string.receive_news_and_offers_request_body),
               R.string.app_entry_dialog_accept,
               R.string.app_entry_dialog_no_thanks,
-              Some(color)
+              Some(R.string.app_entry_dialog_privacy_policy),
+              color
             )).map { consent =>
             am.setMarketingConsent(consent)
             if (consent.isEmpty) inject[BrowserController].openPrivacyPolicy()
diff --git a/app/src/main/scala/com/waz/zclient/appentry/fragments/VerifyTeamEmailFragment.scala b/app/src/main/scala/com/waz/zclient/appentry/fragments/VerifyTeamEmailFragment.scala
@@ -73,13 +73,13 @@ case class VerifyTeamEmailFragment() extends CreateTeamFragment{
             inject[GlobalModule].prefs(GlobalPreferences.ShowMarketingConsentDialog).apply().flatMap {
               case true =>
                 inject[AccentColorController].accentColor.head.flatMap(color =>
-                  showConfirmationDialogWithNeutralButton(
-                    R.string.receive_news_and_offers_request_title,
-                    R.string.receive_news_and_offers_request_body,
-                    R.string.app_entry_dialog_privacy_policy,
+                  showConfirmationDialog(
+                    getString(R.string.receive_news_and_offers_request_title),
+                    getString(R.string.receive_news_and_offers_request_body),
                     R.string.app_entry_dialog_accept,
                     R.string.app_entry_dialog_not_now,
-                    Some(color)
+                    Some(R.string.app_entry_dialog_privacy_policy),
+                    color
                   )
                 )
               case false => Future.successful(Some(false))
diff --git a/app/src/main/scala/com/waz/zclient/calling/controllers/CallController.scala b/app/src/main/scala/com/waz/zclient/calling/controllers/CallController.scala
@@ -23,7 +23,7 @@ import com.waz.api.Verification
 import com.waz.avs.VideoPreview
 import com.waz.content.GlobalPreferences
 import com.waz.log.BasicLogging.LogTag.DerivedLogTag
-import com.waz.model.{AssetId, LocalInstant, UserData, UserId}
+import com.waz.model._
 import com.waz.service.ZMessaging.clock
 import com.waz.service.call.Avs.VideoState
 import com.waz.service.call.{CallInfo, CallingService, GlobalCallingService}
@@ -183,6 +183,7 @@ class CallController(implicit inj: Injector, cxt: WireContext, eventContext: Eve
 
 
   val conversation        = callingZms.zip(callConvId) flatMap { case (z, cId) => z.convsStorage.signal(cId) }
+  val convMuteStatus      = conversation.map(_.muted)
   val conversationName    = conversation.map(_.displayName)
   val conversationMembers = for {
     zms     <- callingZms
@@ -263,8 +264,18 @@ class CallController(implicit inj: Injector, cxt: WireContext, eventContext: Eve
     active
   }
 
+  private lazy val availability = for {
+    zms   <- callingZms
+    users <- userStorage
+    self  <- users.signal(zms.selfUserId)
+  } yield self.availability
+
   onCallStarted.on(Threading.Ui) { _ =>
-    CallingActivity.start(cxt)
+    Signal(availability, convMuteStatus).head.foreach {
+      case (Availability.Away, _) =>
+      case (Availability.Busy, muted) if muted.isAllMuted =>
+      case _ => CallingActivity.start(cxt)
+    }
   }(EventContext.Global)
 
   (lastCallAccountId zip isCallEstablished).onChanged.filter(_._2 == true) { case (userId, _) =>
diff --git a/app/src/main/scala/com/waz/zclient/calling/controllers/CallStartController.scala b/app/src/main/scala/com/waz/zclient/calling/controllers/CallStartController.scala
@@ -91,7 +91,8 @@ class CallStartController(implicit inj: Injector, cxt: WireContext, ec: EventCon
               getString(R.string.calling_ongoing_call_title),
               getString(if (isJoiningCall) R.string.calling_ongoing_call_join_message else R.string.calling_ongoing_call_start_message),
               positiveRes = if (isJoiningCall) R.string.calling_ongoing_call_join_anyway else R.string.calling_ongoing_call_start_anyway,
-              accentColor = Some(color)
+              negativeRes = android.R.string.cancel,
+              color       = color
             ).flatMap {
               case true  => z.calling.endCall(c.convId, skipTerminating = true).map(_ => (true, true))
               case false => Future.successful((false, false))
@@ -110,7 +111,7 @@ class CallStartController(implicit inj: Injector, cxt: WireContext, ec: EventCon
               showConfirmationDialog(
                 getString(R.string.calling__slow_connection__title),
                 getString(R.string.calling__video_call__slow_connection__message),
-                accentColor = Some(color)
+                color = color
               )
             case _                                => Future.successful(true)
           }
@@ -121,7 +122,8 @@ class CallStartController(implicit inj: Injector, cxt: WireContext, ec: EventCon
               getString(R.string.group_calling_title),
               getString(R.string.group_calling_message, members.size.toString),
               positiveRes = R.string.group_calling_confirm,
-              accentColor = Some(color)
+              negativeRes = android.R.string.cancel,
+              color       = color
             )
           else
             Future.successful(true)
diff --git a/app/src/main/scala/com/waz/zclient/common/controllers/SharingController.scala b/app/src/main/scala/com/waz/zclient/common/controllers/SharingController.scala
@@ -59,7 +59,12 @@ class SharingController(implicit injector: Injector, wContext: WireContext, even
           case TextContent(t) =>
             convsUi.sendTextMessages(convs, t, Nil, expiration)
           case uriContent =>
-            convsUi.sendAssetMessages(convs, uriContent.uris.map(UriInput), (s: Long) => showWifiWarningDialog(s, Some(color))(activity), expiration)
+            convsUi.sendAssetMessages(
+              convs,
+              uriContent.uris.map(UriInput),
+              (s: Long) => showWifiWarningDialog(s, color)(dispatcher, activity),
+              expiration
+            )
         }
       }
     }
diff --git a/app/src/main/scala/com/waz/zclient/conversation/ConversationController.scala b/app/src/main/scala/com/waz/zclient/conversation/ConversationController.scala
@@ -186,7 +186,7 @@ class ConversationController(implicit injector: Injector, context: Context, ec:
         ui.sendAssetMessage(
           id,
           UriInput(uri),
-          (s: Long) => showWifiWarningDialog(s, Some(color))(activity)
+          (s: Long) => showWifiWarningDialog(s, color)(dispatcher, activity)
         )
       )
     )
@@ -199,7 +199,7 @@ class ConversationController(implicit injector: Injector, context: Context, ec:
             ui.sendMessage(
               id,
               asset,
-              (s: Long) => showWifiWarningDialog(s, Some(color))(activity)
+              (s: Long) => showWifiWarningDialog(s, color)(dispatcher, activity)
             )
           )
         )
diff --git a/app/src/main/scala/com/waz/zclient/messages/UsersController.scala b/app/src/main/scala/com/waz/zclient/messages/UsersController.scala
@@ -90,23 +90,7 @@ class UsersController(implicit injector: Injector, context: Context)
       verbose(l"mask = $mask, bit = ${availability.bitmask}, res = ${mask & availability.bitmask}")
       if ((mask & availability.bitmask) == 0) {
         inject[AccentColorController].accentColor.head.foreach { color =>
-          val (title, body) = availability match {
-            case Availability.None      =>
-              (R.string.availability_notification_warning_nostatus_title, R.string.availability_notification_warning_nostatus)
-            case Availability.Available =>
-              (R.string.availability_notification_warning_available_title, R.string.availability_notification_warning_available)
-            case Availability.Busy      =>
-              (R.string.availability_notification_warning_busy_title, R.string.availability_notification_warning_busy)
-            case Availability.Away      =>
-              (R.string.availability_notification_warning_away_title, R.string.availability_notification_warning_away)
-          }
-          showConfirmationDialog(
-            title       = getString(title),
-            msg         = getString(body),
-            positiveRes = R.string.availability_notification_dont_show,
-            negativeRes = R.string.availability_notification_ok,
-            accentColor = Some(color)
-          ).foreach {
+          showStatusNotificationWarning(availability, color).foreach {
             if (_) prefs(UserPreferences.StatusNotificationsBitmask).mutate(_ | availability.bitmask)
           }
         }
diff --git a/app/src/main/scala/com/waz/zclient/notifications/controllers/CallingNotificationsController.scala b/app/src/main/scala/com/waz/zclient/notifications/controllers/CallingNotificationsController.scala
@@ -155,8 +155,7 @@ class CallingNotificationsController(implicit cxt: WireContext, eventContext: Ev
     verbose(l"${nots.size} call notifications")
 
     cancelNots(nots)
-    nots.foreach {
-      case not if not.action != NotificationAction.Nothing =>
+    nots.foreach { not =>
         val builder = androidNotificationBuilder(not)
 
         def showNotification() = {
@@ -175,7 +174,6 @@ class CallingNotificationsController(implicit cxt: WireContext, eventContext: Ev
               case NonFatal(e2) => error(l"second display attempt failed, aborting", e2)
             }
         }
-      case _ =>
     }
   }
 
diff --git a/app/src/main/scala/com/waz/zclient/pages/main/MainPhoneFragment.scala b/app/src/main/scala/com/waz/zclient/pages/main/MainPhoneFragment.scala
@@ -105,7 +105,7 @@ class MainPhoneFragment extends FragmentHelper
                                getString(R.string.crashes_and_analytics_request_body),
                                R.string.crashes_and_analytics_request_agree,
                                R.string.crashes_and_analytics_request_no,
-                               Some(color)
+                               color
                              ).flatMap { resp =>
                                zms.head.flatMap { zms =>
                                  for {
@@ -118,30 +118,18 @@ class MainPhoneFragment extends FragmentHelper
     askMarketingConsentAgain <- am.userPrefs(UserPreferences.AskMarketingConsentAgain).apply()
                              // Show marketing consent popup
     _                        <- if (!askMarketingConsentAgain) Future.successful({}) else
-                             showConfirmationDialogWithNeutralButton(
-                               R.string.receive_news_and_offers_request_title,
-                               R.string.receive_news_and_offers_request_body,
-                               R.string.app_entry_dialog_privacy_policy,
+                             showConfirmationDialog(
+                               getString(R.string.receive_news_and_offers_request_title),
+                               getString(R.string.receive_news_and_offers_request_body),
                                R.string.app_entry_dialog_accept,
                                R.string.app_entry_dialog_not_now,
-                               Some(color)
+                               Some(R.string.app_entry_dialog_privacy_policy),
+                               color
                              ).map { confirmed =>
                                am.setMarketingConsent(confirmed)
                                if (confirmed.isEmpty) inject[BrowserController].openPrivacyPolicy()
                              }
   } yield {}
-/*
-  private var prevAvailability = Option.empty[Availability]
-  private lazy val curAvailability = for {
-    prefs     <- inject[Signal[UserPreferences]]
-    mask      <- prefs(UserPreferences.StatusNotificationsBitmask).signal
-    _ = verbose(l"AVV mask: $mask")
-    avVisible <- usersController.availabilityVisible
-    _ = verbose(l"AVV avVisible: $avVisible")
-    av        <- if (!avVisible) Signal.const(Option.empty[Availability])
-                 else usersController.selfUser.map(_.availability).map(Option(_))
-    _ = verbose(l"AVV av: $av")
-  } yield (av, mask)*/
 
   override def onCreateView(inflater: LayoutInflater, container: ViewGroup, savedInstanceState: Bundle): View = {
     if (savedInstanceState == null)
@@ -210,41 +198,6 @@ class MainPhoneFragment extends FragmentHelper
 
       case _ =>
     }
-/*
-    curAvailability.onUi { case (cur, mask) =>
-      verbose(l"AVV ($cur, $mask)")
-      verbose(l"AVV prevAvailability: $prevAvailability")
-      val av = if (cur.isEmpty || prevAvailability.isEmpty || cur == prevAvailability) Option.empty[Availability]
-      else cur.flatMap { av => if ((mask & av.bitmask) == 0) Some(av) else None }
-
-      verbose(l"AVV av after filtering: $av")
-
-      av.foreach { availability =>
-        val (title, body) = availability match {
-          case Availability.None      => (R.string.availability_notification_warning_nostatus_title, R.string.availability_notification_warning_nostatus)
-          case Availability.Available => (R.string.availability_notification_warning_available_title, R.string.availability_notification_warning_available)
-          case Availability.Busy      => (R.string.availability_notification_warning_busy_title, R.string.availability_notification_warning_busy)
-          case Availability.Away      => (R.string.availability_notification_warning_away_title, R.string.availability_notification_warning_away)
-        }
-        accentColorController.accentColor.head.foreach { color =>
-          showConfirmationDialog(
-            getString(title),
-            getString(body),
-            R.string.availability_notification_dont_show,
-            R.string.availability_notification_ok,
-            Some(color)
-          ).foreach {
-            case false =>
-            case true =>
-              inject[Signal[UserPreferences]].head.foreach { prefs =>
-                prefs(UserPreferences.StatusNotificationsBitmask).mutate(_ | availability.bitmask)
-              }
-          }
-        }
-      }
-
-      prevAvailability = cur
-    }*/
   }
 
   override def onStart(): Unit = {
diff --git a/app/src/main/scala/com/waz/zclient/utils/ContextUtils.scala b/app/src/main/scala/com/waz/zclient/utils/ContextUtils.scala

Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,8 @@ trait SSOFragment extends FragmentHelper with DerivedLogTag {`
`111`	`111`	`inject[AccentColorController].accentColor.head.flatMap { color =>`
`112`	`112`	`showConfirmationDialog(`
`113`	`113`	`title = getString(R.string.sso_signin_error_title),`
`114`		`- msg = getString(R.string.sso_signin_error_try_again_message, error.code.toString),`
`115`		`- accentColor = Some(color)`
	`114`	`+ msg = getString(R.string.sso_signin_error_try_again_message, error.code.toString),`
	`115`	`+ color = color`
`116`	`116`	`)`
`117`	`117`	`}.map(_ => ())`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,12 @@ class SharingController(implicit injector: Injector, wContext: WireContext, even`
`59`	`59`	`case TextContent(t) =>`
`60`	`60`	`convsUi.sendTextMessages(convs, t, Nil, expiration)`
`61`	`61`	`case uriContent =>`
`62`		`- convsUi.sendAssetMessages(convs, uriContent.uris.map(UriInput), (s: Long) => showWifiWarningDialog(s, Some(color))(activity), expiration)`
	`62`	`+ convsUi.sendAssetMessages(`
	`63`	`+ convs,`
	`64`	`+ uriContent.uris.map(UriInput),`
	`65`	`+ (s: Long) => showWifiWarningDialog(s, color)(dispatcher, activity),`
	`66`	`+ expiration`
	`67`	`+ )`
`63`	`68`	`}`
`64`	`69`	`}`
`65`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ class ConversationController(implicit injector: Injector, context: Context, ec:`
`186`	`186`	`ui.sendAssetMessage(`
`187`	`187`	`id,`
`188`	`188`	`UriInput(uri),`
`189`		`- (s: Long) => showWifiWarningDialog(s, Some(color))(activity)`
	`189`	`+ (s: Long) => showWifiWarningDialog(s, color)(dispatcher, activity)`
`190`	`190`	`)`
`191`	`191`	`)`
`192`	`192`	`)`
`@@ -199,7 +199,7 @@ class ConversationController(implicit injector: Injector, context: Context, ec:`
`199`	`199`	`ui.sendMessage(`
`200`	`200`	`id,`
`201`	`201`	`asset,`
`202`		`- (s: Long) => showWifiWarningDialog(s, Some(color))(activity)`
	`202`	`+ (s: Long) => showWifiWarningDialog(s, color)(dispatcher, activity)`
`203`	`203`	`)`
`204`	`204`	`)`
`205`	`205`	`)`