diff --git a/TMessagesProj/src/main/java/com/radolyn/ayugram/proprietary b/TMessagesProj/src/main/java/com/radolyn/ayugram/proprietary index 946bb6565..e88b0d51d 160000 --- a/TMessagesProj/src/main/java/com/radolyn/ayugram/proprietary +++ b/TMessagesProj/src/main/java/com/radolyn/ayugram/proprietary @@ -1 +1 @@ -Subproject commit 946bb6565133796d5fcc4df8d63a78c360342581 +Subproject commit e88b0d51d74d41ec7a873011a69dbf77fc854aaf diff --git a/TMessagesProj/src/main/java/com/radolyn/ayugram/sync/AyuSyncConfig.java b/TMessagesProj/src/main/java/com/radolyn/ayugram/sync/AyuSyncConfig.java index c6fad835e..b2c6875fc 100644 --- a/TMessagesProj/src/main/java/com/radolyn/ayugram/sync/AyuSyncConfig.java +++ b/TMessagesProj/src/main/java/com/radolyn/ayugram/sync/AyuSyncConfig.java @@ -21,15 +21,19 @@ public class AyuSyncConfig { } public static String getWebSocketURL() { - return getWebSocketProtocol() + AyuConfig.getSyncServerURL() + "/v1/sync/ws"; + return getWebSocketProtocol() + AyuConfig.getSyncServerURL() + "/sync/ws/v1"; } - public static String getSyncBaseURL() { - return getHTTPProtocol() + AyuConfig.getSyncServerURL() + "/v1/sync"; + public static String getUserDataURL() { + return getHTTPProtocol() + AyuConfig.getSyncServerURL() + "/user/v1"; } - public static String getAyuBaseURL() { - return getHTTPProtocol() + AyuConfig.getSyncServerURL() + "/v1/ayu"; + public static String getRegisterDeviceURL() { + return getHTTPProtocol() + AyuConfig.getSyncServerURL() + "/sync/register/v1"; + } + + public static String getForceSyncURL() { + return getHTTPProtocol() + AyuConfig.getSyncServerURL() + "/sync/force/v1"; } public static String getToken() { diff --git a/TMessagesProj/src/main/java/com/radolyn/ayugram/sync/AyuSyncController.java b/TMessagesProj/src/main/java/com/radolyn/ayugram/sync/AyuSyncController.java index b5af3109f..f1fdbd8dc 100644 --- a/TMessagesProj/src/main/java/com/radolyn/ayugram/sync/AyuSyncController.java +++ b/TMessagesProj/src/main/java/com/radolyn/ayugram/sync/AyuSyncController.java @@ -127,7 +127,7 @@ public class AyuSyncController { // note for the code explorers: // yes, you can nullify this code in smali, but we have server side check, // so you can't sync without AyuGram MVP. - if (self.mvpUntil == null) { + if (!self.isMVP) { nullifyInstance(); AyuSyncState.setConnectionState(AyuSyncConnectionState.NoMVP); enqueueRetry(); @@ -137,7 +137,7 @@ public class AyuSyncController { var deviceName = AyuUtils.getDeviceName(); var deviceIdentifier = AyuUtils.getDeviceIdentifier(); - var url = AyuSyncConfig.getSyncBaseURL() + "/register"; + var url = AyuSyncConfig.getRegisterDeviceURL(); var obj = new JsonObject(); obj.addProperty("name", deviceName); @@ -176,7 +176,7 @@ public class AyuSyncController { } private AyuUser getSelfForConnect() { - var url = AyuSyncConfig.getAyuBaseURL() + "/info"; + var url = AyuSyncConfig.getUserDataURL(); var request = new Request.Builder() .url(url) @@ -192,7 +192,7 @@ public class AyuSyncController { .setDateFormat("yyyy-MM-dd'T'HH:mm:ssz") .create() .fromJson(response.body().string(), AyuUser.class); - } catch (IOException e) { + } catch (Exception e) { Log.d("AyuSync", "Failed to get self: " + e.getMessage()); enqueueRetry(); } @@ -207,7 +207,7 @@ public class AyuSyncController { private void forceSyncInner() { var userId = UserConfig.getInstance(UserConfig.selectedAccount).getClientUserId(); - var url = AyuSyncConfig.getSyncBaseURL() + "/force"; + var url = AyuSyncConfig.getForceSyncURL(); var obj = new JsonObject(); obj.addProperty("userId", userId); diff --git a/TMessagesProj/src/main/java/com/radolyn/ayugram/sync/models/AyuUser.java b/TMessagesProj/src/main/java/com/radolyn/ayugram/sync/models/AyuUser.java index 732d3371d..0a4a61264 100644 --- a/TMessagesProj/src/main/java/com/radolyn/ayugram/sync/models/AyuUser.java +++ b/TMessagesProj/src/main/java/com/radolyn/ayugram/sync/models/AyuUser.java @@ -9,12 +9,10 @@ package com.radolyn.ayugram.sync.models; -import java.util.Date; - public class AyuUser { public String id; public String accessToken; - public Date mvpUntil; + public boolean isMVP; }