From baff77c509fd1b98632e4ccd9f770f7f97e3f87a Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Thu, 1 Sep 2016 14:04:17 -0700
Subject: [PATCH] Revert "Remove Android requirement from install flow"

This reverts commit 4b9f7d518e3ed106d1d7d0b70d042159b02161a6.
Put this back when iOS desktop support is ready for general release.
---
 _locales/en/messages.json | 14 +++++---------
 js/views/install_view.js  |  5 ++---
 options.html              |  1 +
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index bc203cdd..3786e9e4 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -159,22 +159,18 @@
         "message": "Get started"
     },
     "installSignalLink": {
-        "message": "First, install Signal on your <a $play_store$>Android</a> or <a $app_store$>iPhone</a>.<br /> We'll link your devices and keep your messages in sync.",
-        "description": "Prompt the user to install Signal on their phone before linking",
+        "message": "First, install <a $a_params$>Signal</a> on your Android phone.<br /> We'll link your devices and keep your messages in sync.",
+        "description": "Prompt the user to install Signal on Android before linking",
         "placeholders": {
-          "play_store": {
-            "content": "$1",
-            "example": "href='http://example.com'"
-          },
-          "app_store": {
+          "a_params": {
             "content": "$1",
             "example": "href='http://example.com'"
           }
         }
     },
     "installIHaveSignalButton": {
-        "message": "Got it",
-        "description": "Button for the user to confirm that they have Signal installed."
+        "message": "I have Signal for Android",
+        "description": "Button for the user to confirm that they have Signal for Android"
     },
     "installFollowUs": {
         "message": "<a $a_params$>Follow us</a> for updates about multi-device support for iOS.",
diff --git a/js/views/install_view.js b/js/views/install_view.js
index 49158318..dc713f00 100644
--- a/js/views/install_view.js
+++ b/js/views/install_view.js
@@ -8,14 +8,13 @@
     Whisper.InstallView = Whisper.View.extend({
         templateName: 'install_flow_template',
         render_attributes: function() {
-            var playStoreHref = 'https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms';
-            var appStoreHref = 'https://itunes.apple.com/us/app/signal-private-messenger/id874139669';
+            var installSignalHref = 'https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms';
             var twitterHref = 'https://twitter.com/whispersystems';
             return {
                 installWelcome: i18n('installWelcome'),
                 installTagline: i18n('installTagline'),
                 installGetStartedButton: i18n('installGetStartedButton'),
-                installSignalLink: this.i18n_with_link('installSignalLink', playStoreHref, appStoreHref),
+                installSignalLink: this.i18n_with_link('installSignalLink', installSignalHref),
                 installIHaveSignalButton: i18n('installIHaveSignalButton'),
                 installFollowUs: this.i18n_with_link('installFollowUs', twitterHref),
                 installAndroidInstructions: i18n('installAndroidInstructions'),
diff --git a/options.html b/options.html
index dc0f28e2..58d431ca 100644
--- a/options.html
+++ b/options.html
@@ -26,6 +26,7 @@
         <div class='nav'>
           <p>{{{ installSignalLink }}}</p>
           <div> <a class='button step3'>{{ installIHaveSignalButton }}</a> </div>
+          <p>{{{ installFollowUs }}}</p>
           <span class='dot step1'></span>
           <span class='dot step2 selected'></span>
           <span class='dot step3'></span>