From 878b0c92759a721bfcf83897477b5fb5fb77aa6b Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Thu, 20 Aug 2020 10:18:14 -0300
Subject: [PATCH] Change group invite link host.

---
 app/src/main/AndroidManifest.xml                 |  2 +-
 .../securesms/groups/v2/GroupInviteLinkUrl.java  |  2 +-
 .../groups/v2/GroupInviteLinkUrlTest.java        |  6 +++---
 ...teLinkUrl_InvalidGroupLinkException_Test.java | 16 ++++++++--------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 569a2be870..f37501a1b8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -228,7 +228,7 @@
             <category android:name="android.intent.category.DEFAULT" />
             <category android:name="android.intent.category.BROWSABLE" />
             <data android:scheme="https"
-                  android:host="group.signal.org"/>
+                  android:host="signal.group"/>
         </intent-filter>
 
         <meta-data android:name="com.sec.minimode.icon.portrait.normal"
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl.java b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl.java
index f6848e0628..317dc2d489 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl.java
@@ -17,7 +17,7 @@ import java.net.URL;
 
 public final class GroupInviteLinkUrl {
 
-  private static final String GROUP_URL_HOST   = "group.signal.org";
+  private static final String GROUP_URL_HOST   = "signal.group";
   private static final String GROUP_URL_PREFIX = "https://" + GROUP_URL_HOST + "/#";
 
   private final GroupMasterKey    groupMasterKey;
diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrlTest.java b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrlTest.java
index 9fa3a7fc91..593febf109 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrlTest.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrlTest.java
@@ -25,15 +25,15 @@ public final class GroupInviteLinkUrlTest {
 
       givenGroup().withMasterKey("a501335111fa04e3756c24b6eb87264e2dfb622e8e1d339179765410776c0488")
                   .andPassword("f08b7e22fb938c025e6c158b7d544956")
-                  .expectUrl("https://group.signal.org/#CjQKIKUBM1ER-gTjdWwktuuHJk4t-2Iujh0zkXl2VBB3bASIEhDwi34i-5OMAl5sFYt9VElW"),
+                  .expectUrl("https://signal.group/#CjQKIKUBM1ER-gTjdWwktuuHJk4t-2Iujh0zkXl2VBB3bASIEhDwi34i-5OMAl5sFYt9VElW"),
 
       givenGroup().withMasterKey("2ca23c04d7cf60fe04039ae76d1912202c2a463d345d9cd48cf27f260dd37f6f")
                   .andPassword("2734457c02ce51da71ad0b62f3c222f7")
-                  .expectUrl("https://group.signal.org/#CjQKICyiPATXz2D-BAOa520ZEiAsKkY9NF2c1IzyfyYN039vEhAnNEV8As5R2nGtC2LzwiL3"),
+                  .expectUrl("https://signal.group/#CjQKICyiPATXz2D-BAOa520ZEiAsKkY9NF2c1IzyfyYN039vEhAnNEV8As5R2nGtC2LzwiL3"),
 
       givenGroup().withMasterKey("00f7e0c2a71ab064cc3ced4c04f08d7b7ef4b84b2c2206f69833be6cfe34df80")
                   .andPassword("9bc324eec437cfda6ae5b8aefbf47ee8")
-                  .expectUrl("https://group.signal.org/#CjQKIAD34MKnGrBkzDztTATwjXt-9LhLLCIG9pgzvmz-NN-AEhCbwyTuxDfP2mrluK779H7o")
+                  .expectUrl("https://signal.group/#CjQKIAD34MKnGrBkzDztTATwjXt-9LhLLCIG9pgzvmz-NN-AEhCbwyTuxDfP2mrluK779H7o")
     );
   }
 
diff --git a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl_InvalidGroupLinkException_Test.java b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl_InvalidGroupLinkException_Test.java
index 2255476079..28fe8ac025 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl_InvalidGroupLinkException_Test.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/groups/v2/GroupInviteLinkUrl_InvalidGroupLinkException_Test.java
@@ -36,42 +36,42 @@ public final class GroupInviteLinkUrl_InvalidGroupLinkException_Test {
 
   @Test
   public void has_path() {
-    assertThatThrownBy(() -> GroupInviteLinkUrl.fromUrl("https://group.signal.org/not_expected/#CAESNAogpQEzURH6BON1bCS264cmTi37Yi6OHTOReXZUEHdsBIgSEPCLfiL7k4wCXmwVi31USVY"))
+    assertThatThrownBy(() -> GroupInviteLinkUrl.fromUrl("https://signal.group/not_expected/#CAESNAogpQEzURH6BON1bCS264cmTi37Yi6OHTOReXZUEHdsBIgSEPCLfiL7k4wCXmwVi31USVY"))
                       .isInstanceOf(GroupInviteLinkUrl.InvalidGroupLinkException.class)
                       .hasMessage("No path was expected in url");
   }
 
   @Test
   public void missing_ref() {
-    assertThatThrownBy(() -> GroupInviteLinkUrl.fromUrl("https://group.signal.org/"))
+    assertThatThrownBy(() -> GroupInviteLinkUrl.fromUrl("https://signal.group/"))
                        .isInstanceOf(GroupInviteLinkUrl.InvalidGroupLinkException.class)
                        .hasMessage("No reference was in the url");
   }
 
   @Test
   public void empty_ref() {
-    assertThatThrownBy(() -> GroupInviteLinkUrl.fromUrl("https://group.signal.org/#"))
+    assertThatThrownBy(() -> GroupInviteLinkUrl.fromUrl("https://signal.group/#"))
                       .isInstanceOf(GroupInviteLinkUrl.InvalidGroupLinkException.class)
                       .hasMessage("No reference was in the url");
   }
 
   @Test
   public void bad_base64() {
-    assertThatThrownBy(() -> GroupInviteLinkUrl.fromUrl("https://group.signal.org/#CAESNAogpQEzURH6BON1bCS264cmTi37Yi6HTOReXZUEHdsBIgSEPCLfiL7k4wCX;mwVi31USVY"))
+    assertThatThrownBy(() -> GroupInviteLinkUrl.fromUrl("https://signal.group/#CAESNAogpQEzURH6BON1bCS264cmTi37Yi6HTOReXZUEHdsBIgSEPCLfiL7k4wCX;mwVi31USVY"))
                       .isInstanceOf(GroupInviteLinkUrl.InvalidGroupLinkException.class)
                       .hasCauseExactlyInstanceOf(IOException.class);
   }
 
   @Test
   public void bad_protobuf() {
-    assertThatThrownBy(() -> GroupInviteLinkUrl.fromUrl("https://group.signal.org/#CAESNAogpQEzURH6BON1bCS264cmTi37Yi6HTOReXZUEHdsBIgSEPCLfiL7k4wCXmwVi31USVY"))
+    assertThatThrownBy(() -> GroupInviteLinkUrl.fromUrl("https://signal.group/#CAESNAogpQEzURH6BON1bCS264cmTi37Yi6HTOReXZUEHdsBIgSEPCLfiL7k4wCXmwVi31USVY"))
                       .isInstanceOf(GroupInviteLinkUrl.InvalidGroupLinkException.class)
                       .hasCauseExactlyInstanceOf(InvalidProtocolBufferException.class);
   }
 
   @Test
   public void version_999_url() {
-    String url = "https://group.signal.org/#uj4zCiDMSxlNUvF4bQ3z3fYzGyZTFbJ1xEqWbPE3uZSD8bjOrxIP8NxV-0GUz3jpxMLR1rN3";
+    String url = "https://signal.group/#uj4zCiDMSxlNUvF4bQ3z3fYzGyZTFbJ1xEqWbPE3uZSD8bjOrxIP8NxV-0GUz3jpxMLR1rN3";
 
     assertThatThrownBy(() -> GroupInviteLinkUrl.fromUrl(url))
                       .isInstanceOf(GroupInviteLinkUrl.UnknownGroupLinkVersionException.class)
@@ -85,7 +85,7 @@ public final class GroupInviteLinkUrl_InvalidGroupLinkException_Test {
 
     String encoding = createEncodedProtobuf(masterKeyBytes, password.serialize());
 
-    String url = "https://group.signal.org/#" + encoding;
+    String url = "https://signal.group/#" + encoding;
 
     assertThatThrownBy(() -> GroupInviteLinkUrl.fromUrl(url))
                       .isInstanceOf(GroupInviteLinkUrl.InvalidGroupLinkException.class)
@@ -99,7 +99,7 @@ public final class GroupInviteLinkUrl_InvalidGroupLinkException_Test {
 
     String encoding = createEncodedProtobuf(groupMasterKey.serialize(), passwordBytes);
 
-    String url = "https://group.signal.org/#" + encoding;
+    String url = "https://signal.group/#" + encoding;
 
     assertThatThrownBy(() -> GroupInviteLinkUrl.fromUrl(url))
                       .isInstanceOf(GroupInviteLinkUrl.InvalidGroupLinkException.class)