lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix some crash in provider

This commit is contained in:
世界 2021-02-13 11:34:40 +08:00
parent 52fc46a0d5
commit e954b7fd2e
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
4 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java
View File

@ -46,12 +46,6 @@ import android.provider.CallLog;
import android.provider.DocumentsContract;
import android.provider.MediaStore;
import android.provider.Settings;
import androidx.core.content.FileProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager.widget.ViewPager;
import android.telephony.TelephonyManager;
import android.text.Layout;
import android.text.Selection;
@ -95,6 +89,7 @@ import android.widget.TextView;
import androidx.core.content.FileProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager.widget.ViewPager;
import com.android.internal.telephony.ITelephony;
@ -1708,6 +1703,7 @@ public class AndroidUtilities {
}
public static void runOnUIThread(Runnable runnable, long delay) {
if (ApplicationLoader.applicationHandler == null) return;
if (delay == 0) {
ApplicationLoader.applicationHandler.post(runnable);
} else {

15
TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java
View File

@ -38,15 +38,11 @@ import org.telegram.ui.Components.ForegroundDetector;
import java.io.File;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.util.Set;
import tw.nekomimi.nekogram.ExternalGcm;
import tw.nekomimi.nekogram.NekoConfig;
import tw.nekomimi.nekogram.database.WarppedPref;
import tw.nekomimi.nekogram.utils.EnvUtil;
import tw.nekomimi.nekogram.utils.FileUtil;
import tw.nekomimi.nekogram.utils.ProxyUtil;
import tw.nekomimi.nekogram.utils.UIUtil;
import static android.os.Build.VERSION.SDK_INT;
@ -302,22 +298,11 @@ public class ApplicationLoader extends Application {
else UIUtil.runOnIoDispatcher(initRunnable);
}
if (ProxyUtil.isVPNEnabled()) {
if (NekoConfig.disableProxyWhenVpnEnabled) {
SharedConfig.setProxyEnable(false);
}
}
ExternalGcm.initPlayServices();
if (BuildVars.LOGS_ENABLED) {
FileLog.d("app initied");
}
MediaController.getInstance();
for (int a = 0; a < UserConfig.MAX_ACCOUNT_COUNT; a++) { //TODO improve account
final int finalA = a;

4
TMessagesProj/src/main/java/org/telegram/messenger/SharedConfig.java
View File

@ -10,7 +10,6 @@ package org.telegram.messenger;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.Application;
import android.content.Context;
import android.content.SharedPreferences;
import android.net.Uri;
@ -18,7 +17,6 @@ import android.os.Build;
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.Base64;
import android.util.Log;
import android.util.SparseArray;
import androidx.annotation.Nullable;
@ -1524,8 +1522,6 @@ public class SharedConfig {
static {
loadProxyList();
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
boolean proxyEnabledValue = preferences.getBoolean("proxy_enabled", false);

2
TMessagesProj/src/main/java/org/telegram/tgnet/ConnectionsManager.java
View File

@ -354,6 +354,8 @@ public class ConnectionsManager extends BaseController {
public void init(int version, int layer, int apiId, String deviceModel, String systemVersion, String appVersion, String langCode, String systemLangCode, String configPath, String logPath, String regId, String cFingerprint, int timezoneOffset, int userId, boolean enablePushConnection) {
SharedConfig.loadProxyList();
if (SharedConfig.proxyEnabled && SharedConfig.currentProxy != null) {
if (SharedConfig.currentProxy instanceof SharedConfig.ExternalSocks5Proxy) {
((SharedConfig.ExternalSocks5Proxy) SharedConfig.currentProxy).start();