sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed api endpoint and quicksy domain

This commit is contained in:
Daniel Gultsch 2018-10-30 20:27:26 +01:00
parent a1a625bb2d
commit 3fab93bdd6
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -104,7 +104,7 @@ android {
quicksy { quicksy {
dimension "mode" dimension "mode"
applicationId = "im.conversations.quick" applicationId = "im.quicksy.client"
resValue "string", "app_name", "Quicksy" resValue "string", "app_name", "Quicksy"
resValue "string", "applicationId", applicationId resValue "string", "applicationId", applicationId
buildConfigField "String", "LOGTAG", "\"quicksy\"" buildConfigField "String", "LOGTAG", "\"quicksy\""

2
src/main/java/eu/siacs/conversations/Config.java
View File

@ -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 DOMAIN_LOCK = null; //only allow account creation for this domain
public static final String MAGIC_CREATE_DOMAIN = "conversations.im"; 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 DISALLOW_REGISTRATION_IN_UI = false; //hide the register checkbox
public static final boolean USE_RANDOM_RESOURCE_ON_EVERY_BIND = false; public static final boolean USE_RANDOM_RESOURCE_ON_EVERY_BIND = false;

1
src/main/res/values/strings.xml
View File

@ -775,6 +775,7 @@
<string name="verifying">Verifying…</string> <string name="verifying">Verifying…</string>
<string name="requesting_sms">Requesting SMS…</string> <string name="requesting_sms">Requesting SMS…</string>
<string name="incorrect_pin">The pin you have entered is incorrect.</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_network">Unknown network error.</string>
<string name="unknown_api_error_response">Unknown response from server.</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> <string name="unable_to_connect_to_server">Unable to connect to server.</string>

2
src/quicksy/java/eu/siacs/conversations/services/QuickConversationsService.java
View File

@ -55,7 +55,7 @@ public class QuickConversationsService extends AbstractQuickConversationsService
public static final int API_ERROR_SSL_HANDSHAKE = -4; public static final int API_ERROR_SSL_HANDSHAKE = -4;
public static final int API_ERROR_AIRPLANE_MODE = -5; 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"; private static final String INSTALLATION_ID = "eu.siacs.conversations.installation-id";

4
src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java
View File

@ -280,9 +280,9 @@ public class VerifyActivity extends XmppActivity implements ClipboardManager.OnP
public void onVerificationFailed(final int code) { public void onVerificationFailed(final int code) {
runOnUiThread(() -> { runOnUiThread(() -> {
setVerifyingState(false); setVerifyingState(false);
if (code == 401) { if (code == 401 || code == 404) {
AlertDialog.Builder builder = new AlertDialog.Builder(this); 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.setPositiveButton(R.string.ok, null);
builder.create().show(); builder.create().show();
} else { } else {