overspend1/Overgram4A
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: don't show fwd from a hidden account like it's a current user

Browse Source 
fix: reflect AyuSync changes
This commit is contained in:
ZavaruKitsu
2023-07-21 15:07:15 +00:00
parent 05dfb5ea74
commit c6949861ab
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TMessagesProj/src/main/java/com/radolyn/ayugram/proprietary

Submodule TMessagesProj/src/main/java/com/radolyn/ayugram/proprietary updated: 946bb65651...e88b0d51d7

14
TMessagesProj/src/main/java/com/radolyn/ayugram/sync/AyuSyncConfig.java
View File

@@ -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() {

10
TMessagesProj/src/main/java/com/radolyn/ayugram/sync/AyuSyncController.java
View File

@@ -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);

4
TMessagesProj/src/main/java/com/radolyn/ayugram/sync/models/AyuUser.java
View File

@@ -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;
}