vrr/Partisan-Telegram-Android
2
0
Fork 0
mirror of https://github.com/wrwrabbit/Partisan-Telegram-Android.git synced 2026-04-29 04:29:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 5.13.0 (1818)

Browse source
This commit is contained in:
DrKLO 2019-12-31 16:08:08 +03:00
parent 28eb8dfd0e
commit f41b228a11
2574 changed files with 1023378 additions and 62330 deletions
Download patch file Download diff file Expand all files Collapse all files

75
TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java
View file

@ -65,6 +65,22 @@ public class UserConfig extends BaseController {
public volatile byte[] savedSaltedPassword;
public volatile long savedPasswordTime;
public String tonEncryptedData;
public String tonPublicKey;
public int tonPasscodeType = -1;
public byte[] tonPasscodeSalt;
public long tonPasscodeRetryInMs;
public long tonLastUptimeMillis;
public int tonBadPasscodeTries;
public String tonKeyName;
public boolean tonCreationFinished;
public String walletConfig;
public String walletBlockchainName;
public String walletConfigUrl;
public String walletConfigFromUrl;
public int walletConfigType;
private static volatile UserConfig[] Instance = new UserConfig[UserConfig.MAX_ACCOUNT_COUNT];
public static UserConfig getInstance(int num) {
UserConfig localInstance = Instance[num];
@ -132,6 +148,26 @@ public class UserConfig extends BaseController {
editor.putBoolean("notificationsSignUpSettingsLoaded", notificationsSignUpSettingsLoaded);
editor.putLong("autoDownloadConfigLoadTime", autoDownloadConfigLoadTime);
editor.putBoolean("hasValidDialogLoadIds", hasValidDialogLoadIds);
if (tonEncryptedData != null) {
editor.putString("tonEncryptedData", tonEncryptedData);
editor.putString("tonPublicKey", tonPublicKey);
editor.putString("tonKeyName", tonKeyName);
editor.putBoolean("tonCreationFinished", tonCreationFinished);
if (tonPasscodeSalt != null) {
editor.putInt("tonPasscodeType", tonPasscodeType);
editor.putString("tonPasscodeSalt", Base64.encodeToString(tonPasscodeSalt, Base64.DEFAULT));
editor.putLong("tonPasscodeRetryInMs", tonPasscodeRetryInMs);
editor.putLong("tonLastUptimeMillis", tonLastUptimeMillis);
editor.putInt("tonBadPasscodeTries", tonBadPasscodeTries);
}
} else {
editor.remove("tonEncryptedData").remove("tonPublicKey").remove("tonKeyName").remove("tonPasscodeType").remove("tonPasscodeSalt").remove("tonPasscodeRetryInMs").remove("tonBadPasscodeTries").remove("tonLastUptimeMillis").remove("tonCreationFinished");
}
editor.putString("walletConfig", walletConfig);
editor.putString("walletConfigUrl", walletConfigUrl);
editor.putInt("walletConfigType", walletConfigType);
editor.putString("walletBlockchainName", walletBlockchainName);
editor.putString("walletConfigFromUrl", walletConfigFromUrl);
editor.putInt("6migrateOffsetId", migrateOffsetId);
if (migrateOffsetId != -1) {
@ -146,8 +182,7 @@ public class UserConfig extends BaseController {
try {
SerializedData data = new SerializedData(unacceptedTermsOfService.getObjectSize());
unacceptedTermsOfService.serializeToStream(data);
String str = Base64.encodeToString(data.toByteArray(), Base64.DEFAULT);
editor.putString("terms", str);
editor.putString("terms", Base64.encodeToString(data.toByteArray(), Base64.DEFAULT));
data.cleanup();
} catch (Exception ignore) {
@ -268,6 +303,27 @@ public class UserConfig extends BaseController {
notificationsSignUpSettingsLoaded = preferences.getBoolean("notificationsSignUpSettingsLoaded", false);
autoDownloadConfigLoadTime = preferences.getLong("autoDownloadConfigLoadTime", 0);
hasValidDialogLoadIds = preferences.contains("2dialogsLoadOffsetId") || preferences.getBoolean("hasValidDialogLoadIds", false);
tonEncryptedData = preferences.getString("tonEncryptedData", null);
tonPublicKey = preferences.getString("tonPublicKey", null);
tonKeyName = preferences.getString("tonKeyName", "walletKey" + currentAccount);
tonCreationFinished = preferences.getBoolean("tonCreationFinished", true);
String salt = preferences.getString("tonPasscodeSalt", null);
if (salt != null) {
try {
tonPasscodeSalt = Base64.decode(salt, Base64.DEFAULT);
tonPasscodeType = preferences.getInt("tonPasscodeType", -1);
tonPasscodeRetryInMs = preferences.getLong("tonPasscodeRetryInMs", 0);
tonLastUptimeMillis = preferences.getLong("tonLastUptimeMillis", 0);
tonBadPasscodeTries = preferences.getInt("tonBadPasscodeTries", 0);
} catch (Exception e) {
FileLog.e(e);
}
}
walletConfig = "";//preferences.getString("walletConfig", "");
walletConfigUrl = "https://test.ton.org/config.json";//preferences.getString("walletConfigUrl", "https://test.ton.org/config.json");
walletConfigType = TonController.CONFIG_TYPE_JSON;//preferences.getInt("walletConfigType", TonController.CONFIG_TYPE_JSON);
walletBlockchainName = "";//preferences.getString("walletBlockchainName", "");
walletConfigFromUrl = "";//preferences.getString("walletConfigFromUrl", "");
try {
String terms = preferences.getString("terms", null);
@ -387,8 +443,21 @@ public class UserConfig extends BaseController {
}
}
public void clearTonConfig() {
tonEncryptedData = null;
tonKeyName = null;
tonPublicKey = null;
tonPasscodeType = -1;
tonPasscodeSalt = null;
tonCreationFinished = false;
tonPasscodeRetryInMs = 0;
tonLastUptimeMillis = 0;
tonBadPasscodeTries = 0;
}
public void clearConfig() {
getPreferences().edit().clear().commit();
clearTonConfig();
currentUser = null;
clientUserId = 0;
@ -406,7 +475,7 @@ public class UserConfig extends BaseController {
migrateOffsetAccess = -1;
ratingLoadTime = 0;
botRatingLoadTime = 0;
draftsLoaded = true;
draftsLoaded = false;
contactsReimported = true;
syncContacts = true;
suggestContacts = true;