Fix/custom backend (#2113)

* Rename BackendSelector to BackendController

* Update comment

* Update changes for SE

* WIP: backend urls

* Bind BackendController as a global controller

* Refactor browser controller

* Reload blacklist when switching BE

* Wrap host placeholders in delimiters

* Escape delimiters in regex

* Tidy up

* Pin SE

* Clean up string identifiers

* Bump SE

Author: johnxnguyen

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.2266"
+    zMessagingVersion = "141.0.2267"
     paging_version = "1.0.0"
 
     avsVersion = '4.9.170@aar'

app/src/main/res/values/strings.xml

@@ -518,7 +518,6 @@
     <string name="pref_about_tos_title">Terms of Use</string>
     <string name="pref_about_privacy_policy_title">Privacy Policy</string>
     <string name="pref_about_licenses_title">License information</string>
-    <string name="pref_about_licenses_url">@string/url_third_party_licences</string>
     <string name="pref_about_version_title">Version %s</string>
     <string name="pref_about_copyright_title">\u00A9 Wire Swiss GmbH</string>
 

app/src/main/res/values/strings_no_translate.xml

@@ -175,36 +175,36 @@
     <string translatable="false" name="pref_dev_category_sign_in_account_title">Sign into account</string>
     <string translatable="false" name="pref_dev_category_sign_in_account_summary">Sign into another account and switch to that one</string>
 
-    <string translatable="false" name="pref_manage_team_url">https://teams.wire.com/login/?utm_source=client_settings&amp;utm_term=android</string>
-
-    <string translatable="false" name="pick_user_manage_team_url">https://teams.wire.com/login/?utm_source=client_landing&amp;utm_term=android</string>
-
-    <string translatable="false" name="invalid_email_help">https://support.wire.com/hc/en-us/articles/115004082129-My-email-address-is-already-in-use-and-I-cannot-create-an-account-What-can-I-do-</string>
-    <string translatable="false" name="teams_set_email_about_url">https://support.wire.com/hc/en-us/articles/115004082129</string>
-
-    <string translatable="false" name="url_home">https://wire.com</string>
-    <string translatable="false" name="url_terms_of_service_personal">https://wire.com/legal/terms/personal/</string>
-    <string translatable="false" name="url_terms_of_service_teams">https://wire.com/legal/terms/teams/</string>
-    <string translatable="false" name="url_privacy_policy">https://wire.com/legal/privacy/embed/</string>
-    <string translatable="false" name="url__help">https://support.wire.com</string>
-
-    <string translatable="false" name="url_password_reset">https://account.wire.com/forgot/</string>
-    <string translatable="false" name="url_password_reset_staging">https://wire-account-staging.zinfra.io/forgot/</string>
-
-    <string translatable="false" name="url_third_party_licences">https://wire.com/legal/#licenses</string>
-    <string translatable="false" name="url_otr_learn_why">https://wire.com/privacy/why</string>
-    <string translatable="false" name="url_otr_learn_how">https://wire.com/privacy/how</string>
-    <string translatable="false" name="url_otr_decryption_error_1">https://wire.com/privacy/error-1</string>
-    <string translatable="false" name="url_otr_decryption_error_2">https://wire.com/privacy/error-2</string>
-    <string translatable="false" name="url_about_teams">https://wire.com/products/pro-secure-team-collaboration/</string>
-
-    <string translatable="false" name="url_manage_services">https://teams.wire.com/</string>
-    <string translatable="false" name="url_manage_services_staging">https://wire-admin-dev.zinfra.io/services/</string>
-    <string translatable="false" name="usernames__learn_more__link">https://wire.com/support/username/</string>
-    <string translatable="false" name="pref_support_website_url">https://support.wire.com</string>
-    <string translatable="false" name="pref_support_contact_url">https://support.wire.com/hc/requests/new</string>
-    <string translatable="false" name="pref_about_website_url">https://wire.com</string>
-
+    <!--
+    The prefixes |ACCOUNTS|, |TEAMS|, and |WEBSITE| are placeholders for hosts. These are
+    replaced at runtime with corresponding endpoints defined in the BackendConfig.
+    Custom whitelabel versions can overwrite these with urls (without prefixes of course).
+    -->
+
+    <string translatable="false" name="url_password_forgot">|ACCOUNTS|/forgot/</string>
+
+    <string translatable="false" name="url_pref_manage_team">|TEAMS|/login/?utm_source=client_settings&amp;utm_term=android</string>
+    <string translatable="false" name="url_start_ui_manage_team">|TEAMS|/login/?utm_source=client_landing&amp;utm_term=android</string>
+    <string translatable="false" name="url_manage_services">|TEAMS|/services</string>
+
+    <string translatable="false" name="url_home">|WEBSITE|</string>
+    <string translatable="false" name="url_about_website">|WEBSITE|</string>
+    <string translatable="false" name="url_about_teams">|WEBSITE|/products/pro-secure-team-collaboration/</string>
+    <string translatable="false" name="url_usernames_learn_more">|WEBSITE|/support/username/</string>
+    <string translatable="false" name="url_terms_of_service_personal">|WEBSITE|/legal/terms/personal/</string>
+    <string translatable="false" name="url_terms_of_service_teams">|WEBSITE|/legal/terms/teams/</string>
+    <string translatable="false" name="url_privacy_policy">|WEBSITE|/legal/privacy/embed/</string>
+    <string translatable="false" name="url_third_party_licences">|WEBSITE|/legal/#licenses</string>
+    <string translatable="false" name="url_otr_learn_why">|WEBSITE|/privacy/why</string>
+    <string translatable="false" name="url_otr_learn_how">|WEBSITE|/privacy/how</string>
+    <string translatable="false" name="url_otr_decryption_error_1">|WEBSITE|/privacy/error-1</string>
+    <string translatable="false" name="url_otr_decryption_error_2">|WEBSITE|/privacy/error-2</string>
+
+    <string translatable="false" name="url_help">https://support.wire.com</string>
+    <string translatable="false" name="url_support_website">https://support.wire.com</string>
+    <string translatable="false" name="url_contact_support">https://support.wire.com/hc/requests/new</string>
+    <string translatable="false" name="url_invalid_email_help">https://support.wire.com/hc/en-us/articles/115004082129-My-email-address-is-already-in-use-and-I-cannot-create-an-account-What-can-I-do-</string>
+    <string translatable="false" name="url_teams_set_email_about">https://support.wire.com/hc/en-us/articles/115004082129</string>
 
 </resources>
 

app/src/main/scala/com/waz/zclient/Backend.scala

@@ -45,6 +45,9 @@ object Backend {
     baseUrl = "https://staging-nginz-https.zinfra.io",
     websocketUrl = "https://staging-nginz-ssl.zinfra.io/await",
     blacklistHost = s"https://clientblacklist.wire.com/staging/android",
+    teamsUrl = "https://wire-teams-staging.zinfra.io",
+    accountsUrl = "https://wire-account-staging.zinfra.io",
+    websiteUrl = "https://wire.com",
     StagingFirebaseOptions,
     certPin)
 
@@ -53,6 +56,9 @@ object Backend {
     BuildConfig.BACKEND_URL,
     BuildConfig.WEBSOCKET_URL,
     BuildConfig.BLACKLIST_HOST,
+    teamsUrl = "https://teams.wire.com",
+    accountsUrl = "https://account.wire.com",
+    websiteUrl = "https://wire.com",
     ProdFirebaseOptions,
     certPin)
 }

app/src/main/scala/com/waz/zclient/CredentialsFragment.scala

@@ -374,7 +374,7 @@ class SetOrRequestPasswordFragment extends CredentialsFragment {
     confirmationButton.foreach(_.setAccentColor(Color.WHITE))
 
     Option(findById[View](R.id.ttv_signin_forgot_password)).foreach { forgotPw =>
-      forgotPw.onClick(inject[BrowserController].openForgotPasswordPage())
+      forgotPw.onClick(inject[BrowserController].openForgotPassword())
       forgotPw.setVisibility(if (hasPw) View.VISIBLE else View.INVISIBLE)
     }
 

app/src/main/scala/com/waz/zclient/LaunchActivity.scala

@@ -18,28 +18,59 @@
 
 package com.waz.zclient
 
-import android.content.Intent
+import android.app.AlertDialog
+import android.content.{DialogInterface, Intent}
 import android.support.v7.app.AppCompatActivity
 import com.waz.log.BasicLogging.LogTag
 import com.waz.log.BasicLogging.LogTag.DerivedLogTag
-import com.waz.service.AccountsService
+import com.waz.service.{AccountsService, BackendConfig}
 import com.waz.threading.Threading
 import com.waz.zclient.appentry.AppEntryActivity
 import com.waz.zclient.log.LogUI._
-import com.waz.zclient.utils.BackendSelector
+import com.waz.zclient.utils.BackendController
 
 class LaunchActivity extends AppCompatActivity with ActivityHelper with DerivedLogTag {
 
+  private lazy val backendController = inject[BackendController]
+
   override def onStart() = {
     super.onStart()
 
-    new BackendSelector()(this).selectBackend { be =>
+    val callback: BackendConfig => Unit = { be =>
       getApplication.asInstanceOf[WireApplication].ensureInitialized(be)
       inject[AccountsService].activeAccountId.head(LogTag("BackendSelector")).map {
         case Some(_) => startMain()
         case _ => startSignUp()
       }(Threading.Ui)
     }
+
+    if (backendController.shouldShowBackendSelector) showDialog(callback)
+    else callback(backendController.getStoredBackendConfig.getOrElse(Backend.ProdBackend))
+  }
+
+  /// Presents a dialog to select backend.
+  private def showDialog(callback: BackendConfig => Unit): Unit = {
+    val environments = Backend.byName
+    val items: Array[CharSequence] = environments.keys.toArray
+
+    val builder = new AlertDialog.Builder(this)
+    builder.setTitle("Select Backend")
+
+    builder.setItems(items, new DialogInterface.OnClickListener {
+      override def onClick(dialog: DialogInterface, which: Int): Unit = {
+        val choice = items.apply(which).toString
+        val config = environments.apply(choice)
+        backendController.setStoredBackendConfig(config)
+        callback(config)
+      }
+    })
+
+    builder.setCancelable(false)
+    builder.create().show()
+
+    // QA needs to be able to switch backends via intents. Any changes to the backend
+    // preference while the dialog is open will be treated as a user selection.
+    backendController.onPreferenceSet(callback)
   }
 
   override protected def onNewIntent(intent: Intent) = {

app/src/main/scala/com/waz/zclient/SetHandleFragment.scala

@@ -111,7 +111,7 @@ class SetHandleFragment extends BaseFragment[SetHandleFragment.Container] with F
 
     summaryTextView.foreach { summaryTextView =>
       TextViewUtils.linkifyText(summaryTextView, Color.WHITE, R.string.wire__typeface__light, false, new Runnable() {
-        def run(): Unit = browser.openUrl(getString(R.string.usernames__learn_more__link))
+        def run(): Unit = browser.openUserNamesLearnMore()
       })
     }
 

app/src/main/scala/com/waz/zclient/WireApplication.scala

@@ -86,7 +86,7 @@ import com.waz.zclient.pages.main.pickuser.controller.IPickUserController
 import com.waz.zclient.participants.ParticipantsController
 import com.waz.zclient.preferences.PreferencesController
 import com.waz.zclient.tracking.{CrashController, GlobalTrackingController, UiTrackingController}
-import com.waz.zclient.utils.{AndroidBase64Delegate, BackStackNavigator, BackendSelector, ExternalFileSharing, LocalThumbnailCache, UiStorage}
+import com.waz.zclient.utils.{AndroidBase64Delegate, BackStackNavigator, BackendController, ExternalFileSharing, LocalThumbnailCache, UiStorage}
 import com.waz.zclient.views.DraftMap
 import javax.net.ssl.SSLContext
 import org.threeten.bp.Clock
@@ -201,6 +201,7 @@ object WireApplication extends DerivedLogTag {
     bind [IConfirmationController]       toProvider controllerFactory.getConfirmationController
 
     // global controllers
+    bind [BackendController]       to new BackendController()
     bind [WebSocketController]     to new WebSocketController
     bind [CrashController]         to new CrashController
     bind [AccentColorController]   to new AccentColorController()
@@ -366,7 +367,7 @@ class WireApplication extends MultiDexApplication with WireContext with Injectab
 
     controllerFactory = new ControllerFactory(getApplicationContext)
 
-    new BackendSelector()(this).getStoredBackendConfig.foreach { be =>
+    inject[BackendController].getStoredBackendConfig.foreach { be =>
       ensureInitialized(be)
     }
   }

app/src/main/scala/com/waz/zclient/appentry/AppEntryActivity.scala

@@ -46,7 +46,7 @@ import com.waz.zclient.newreg.fragments.country.CountryController
 import com.waz.zclient.ui.text.{GlyphTextView, TypefaceTextView}
 import com.waz.zclient.ui.utils.KeyboardUtils
 import com.waz.zclient.utils.ContextUtils.{showConfirmationDialog, showErrorDialog}
-import com.waz.zclient.utils.{BackendSelector, ContextUtils, RichView, ViewUtils}
+import com.waz.zclient.utils.{BackendController, ContextUtils, RichView, ViewUtils}
 import com.waz.zclient.views.LoadingIndicatorView
 
 import scala.collection.JavaConverters._
@@ -189,7 +189,7 @@ class AppEntryActivity extends BaseActivity {
                 verbose(l"got config response: $config")
                 enableProgress(false)
 
-                new BackendSelector().switchBackend(inject[GlobalModule], config, configUrl)
+                inject[BackendController].switchBackend(inject[GlobalModule], config, configUrl)
                 verbose(l"switched backend")
 
                 // re-present fragment for updated ui.

app/src/main/scala/com/waz/zclient/appentry/AppEntryDialogs.scala

@@ -18,19 +18,16 @@
 package com.waz.zclient.appentry
 
 import android.content.DialogInterface.OnDismissListener
-import android.content.Intent.{ACTION_VIEW, FLAG_ACTIVITY_NEW_TASK}
-import android.content.{Context, DialogInterface, Intent}
-import android.net.Uri
+import android.content.{Context, DialogInterface}
 import android.support.v7.app.AlertDialog
 import com.waz.log.BasicLogging.LogTag.DerivedLogTag
-import com.waz.utils.returning
 import com.waz.zclient.R
-import com.waz.zclient.log.LogUI._
+import com.waz.zclient.common.controllers.BrowserController
 
 import scala.concurrent.{Future, Promise}
 
 object AppEntryDialogs extends DerivedLogTag {
-  def showTermsAndConditions(context: Context): Future[Boolean] = {
+  def showTermsAndConditions(context: Context, browser: BrowserController): Future[Boolean] = {
     val dialogResult = Promise[Boolean]()
     val dialog = new AlertDialog.Builder(context)
       .setPositiveButton(R.string.app_entry_dialog_accept, new DialogInterface.OnClickListener {
@@ -41,7 +38,7 @@ object AppEntryDialogs extends DerivedLogTag {
       })
       .setNeutralButton(R.string.app_entry_dialog_view, new DialogInterface.OnClickListener {
         override def onClick(dialog: DialogInterface, which: Int): Unit = {
-          onOpenUrl(context, context.getString(R.string.url_terms_of_service_teams))
+          browser.openTeamsTermsOfService()
           dialogResult.trySuccess(false)
         }
       })
@@ -54,7 +51,7 @@ object AppEntryDialogs extends DerivedLogTag {
     dialogResult.future
   }
 
-  def showNotificationsWarning(context: Context): Future[Boolean] = {
+  def showNotificationsWarning(context: Context, browser: BrowserController): Future[Boolean] = {
     val dialogResult = Promise[Boolean]()
     val dialog = new AlertDialog.Builder(context)
       .setPositiveButton(R.string.app_entry_dialog_accept, new DialogInterface.OnClickListener {
@@ -65,7 +62,7 @@ object AppEntryDialogs extends DerivedLogTag {
       })
       .setNeutralButton(R.string.app_entry_dialog_view, new DialogInterface.OnClickListener {
         override def onClick(dialog: DialogInterface, which: Int): Unit = {
-          onOpenUrl(context, context.getString(R.string.url_privacy_policy))
+          browser.openPrivacyPolicy()
           dialogResult.trySuccess(false)
         }
       })
@@ -77,15 +74,4 @@ object AppEntryDialogs extends DerivedLogTag {
     dialog.show()
     dialogResult.future
   }
-
-  private def onOpenUrl(context: Context, url: String) = {
-    try {
-      val normUrl = Uri.parse(if (!url.startsWith("http://") && !url.startsWith("https://")) s"http://$url" else url)
-      val browserIntent = returning(new Intent(ACTION_VIEW, normUrl))(_.addFlags(FLAG_ACTIVITY_NEW_TASK))
-      context.startActivity(browserIntent)
-    }
-    catch {
-      case _: Exception => error(l"Failed to open URL: ${redactedString(url)}")
-    }
-  }
 }