From 3fab93bdd68a3e49634298ff9262ad14de5df3c7 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 30 Oct 2018 20:27:26 +0100
Subject: [PATCH] changed api endpoint and quicksy domain

---
 build.gradle                                                  | 2 +-
 src/main/java/eu/siacs/conversations/Config.java              | 2 +-
 src/main/res/values/strings.xml                               | 1 +
 .../conversations/services/QuickConversationsService.java     | 2 +-
 .../java/eu/siacs/conversations/ui/VerifyActivity.java        | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index befe8b1c7..7fcf8927a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -104,7 +104,7 @@ android {
 
         quicksy {
             dimension "mode"
-            applicationId = "im.conversations.quick"
+            applicationId = "im.quicksy.client"
             resValue "string", "app_name", "Quicksy"
             resValue "string", "applicationId", applicationId
             buildConfigField "String", "LOGTAG", "\"quicksy\""
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index d43622f0e..f28ab354b 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -41,7 +41,7 @@ public final class Config {
 
 	public static final String DOMAIN_LOCK = null; //only allow account creation for this domain
 	public static final String MAGIC_CREATE_DOMAIN = "conversations.im";
-	public static final String QUICKSY_DOMAIN = "venus.fritz.box";
+	public static final String QUICKSY_DOMAIN = "quicksy.im";
 	public static final boolean DISALLOW_REGISTRATION_IN_UI = false; //hide the register checkbox
 
 	public static final boolean USE_RANDOM_RESOURCE_ON_EVERY_BIND = false;
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index bd43daf83..74f597d70 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -775,6 +775,7 @@
     <string name="verifying">Verifying…</string>
     <string name="requesting_sms">Requesting SMS…</string>
     <string name="incorrect_pin">The pin you have entered is incorrect.</string>
+    <string name="pin_expired">The pin we have sent you has expired.</string>
     <string name="unknown_api_error_network">Unknown network error.</string>
     <string name="unknown_api_error_response">Unknown response from server.</string>
     <string name="unable_to_connect_to_server">Unable to connect to server.</string>
diff --git a/src/quicksy/java/eu/siacs/conversations/services/QuickConversationsService.java b/src/quicksy/java/eu/siacs/conversations/services/QuickConversationsService.java
index e34099f92..4cf56dcb3 100644
--- a/src/quicksy/java/eu/siacs/conversations/services/QuickConversationsService.java
+++ b/src/quicksy/java/eu/siacs/conversations/services/QuickConversationsService.java
@@ -55,7 +55,7 @@ public class QuickConversationsService extends AbstractQuickConversationsService
     public static final int API_ERROR_SSL_HANDSHAKE = -4;
     public static final int API_ERROR_AIRPLANE_MODE = -5;
 
-    private static final String BASE_URL = "http://venus.fritz.box:4567";
+    private static final String BASE_URL = "https://api.quicksy.im";
 
     private static final String INSTALLATION_ID = "eu.siacs.conversations.installation-id";
 
diff --git a/src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java b/src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java
index b34574492..80ef88335 100644
--- a/src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java
+++ b/src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java
@@ -280,9 +280,9 @@ public class VerifyActivity extends XmppActivity implements ClipboardManager.OnP
     public void onVerificationFailed(final int code) {
         runOnUiThread(() -> {
             setVerifyingState(false);
-            if (code == 401) {
+            if (code == 401 || code == 404) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setMessage(R.string.incorrect_pin);
+                builder.setMessage(code == 404 ? R.string.pin_expired : R.string.incorrect_pin);
                 builder.setPositiveButton(R.string.ok, null);
                 builder.create().show();
             } else {