~singpolyma/cheogram-android

3fab93bdd68a3e49634298ff9262ad14de5df3c7 — Daniel Gultsch 5 years ago a1a625b
changed api endpoint and quicksy domain
M build.gradle => build.gradle +1 -1
@@ 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\""

M src/main/java/eu/siacs/conversations/Config.java => src/main/java/eu/siacs/conversations/Config.java +1 -1
@@ 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;

M src/main/res/values/strings.xml => src/main/res/values/strings.xml +1 -0
@@ 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>

M src/quicksy/java/eu/siacs/conversations/services/QuickConversationsService.java => src/quicksy/java/eu/siacs/conversations/services/QuickConversationsService.java +1 -1
@@ 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";


M src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java => src/quicksy/java/eu/siacs/conversations/ui/VerifyActivity.java +2 -2
@@ 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 {