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

Fixes

This commit is contained in:
世界 2021-02-17 11:12:28 +08:00
parent e954b7fd2e
commit 94d985c679
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
6 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TMessagesProj/build.gradle
View File

@ -101,7 +101,7 @@ dependencies {
releaseImplementation "com.google.firebase:firebase-crashlytics:$crashlyticsVersion"
releaseImplementation "com.google.android.play:core:$playCoreVersion"
testImplementation 'junit:junit:4.13.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'androidx.test:core:1.3.0'
testImplementation 'org.robolectric:robolectric:4.5.1'

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

@ -1520,18 +1520,6 @@ public class SharedConfig {
public static boolean proxyEnabled;
static {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
boolean proxyEnabledValue = preferences.getBoolean("proxy_enabled", false);
if (proxyEnabledValue && currentProxy == null) proxyEnabledValue = false;
proxyEnabled = proxyEnabledValue;
}
public static void setProxyEnable(boolean enable) {
proxyEnabled = enable;
@ -1760,6 +1748,14 @@ public class SharedConfig {
if (error) saveProxyList();
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
boolean proxyEnabledValue = preferences.getBoolean("proxy_enabled", false);
if (proxyEnabledValue && currentProxy == null) proxyEnabledValue = false;
proxyEnabled = proxyEnabledValue;
}
public static ProxyInfo parseProxyInfo(String url) throws InvalidProxyException {

2
TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
View File

@ -18782,7 +18782,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (!selectedObject.needDrawBluredPreview() && !selectedObject.isLiveLocation() && selectedObject.type != 16) {
items.add(LocaleController.getString("NoQuoteForward", R.string.NoQuoteForward));
options.add(95);
icons.add(R.drawable.baseline_forward_24);
icons.add(R.drawable.baseline_fast_forward_24);
}
if (chatMode != MODE_SCHEDULED) {
if (!UserObject.isUserSelf(currentUser) && NekoConfig.showAddToSavedMessages) {

2
TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java
View File

@ -869,7 +869,7 @@ public class SharedMediaLayout extends FrameLayout implements NotificationCenter
gotoItem.setOnClickListener(v -> onActionBarItemClick(gotochat));
forwardNoQuoteItem = new ActionBarMenuItem(context, null, Theme.getColor(Theme.key_actionBarActionModeDefaultSelector), Theme.getColor(Theme.key_windowBackgroundWhiteGrayText2), false);
forwardNoQuoteItem.setIcon(R.drawable.baseline_forward_24);
forwardNoQuoteItem.setIcon(R.drawable.baseline_fast_forward_24);
forwardNoQuoteItem.setContentDescription(LocaleController.getString("NoQuoteForward", R.string.NoQuoteForward));
forwardNoQuoteItem.setDuplicateParentStateEnabled(false);
actionModeLayout.addView(forwardNoQuoteItem, new LinearLayout.LayoutParams(AndroidUtilities.dp(54), ViewGroup.LayoutParams.MATCH_PARENT));

2
TMessagesProj/src/main/java/org/telegram/ui/MediaActivity.java
View File

@ -661,7 +661,7 @@ public class MediaActivity extends BaseFragment implements NotificationCenter.No
if ((int) dialog_id != 0) {
actionModeViews.add(gotoItem = actionMode.addItemWithWidth(gotochat, R.drawable.msg_message, AndroidUtilities.dp(54), LocaleController.getString("AccDescrGoToMessage", R.string.AccDescrGoToMessage)));
actionModeViews.add(actionMode.addItemWithWidth(forward_noquote, R.drawable.baseline_forward_24, AndroidUtilities.dp(54), LocaleController.getString("NoQuoteForward", R.string.NoQuoteForward)));
actionModeViews.add(actionMode.addItemWithWidth(forward_noquote, R.drawable.baseline_fast_forward_24, AndroidUtilities.dp(54), LocaleController.getString("NoQuoteForward", R.string.NoQuoteForward)));
actionModeViews.add(actionMode.addItemWithWidth(forward, R.drawable.baseline_forward_24, AndroidUtilities.dp(54), LocaleController.getString("Forward", R.string.Forward)));
}
actionModeViews.add(actionMode.addItemWithWidth(delete, R.drawable.baseline_delete_24, AndroidUtilities.dp(54), LocaleController.getString("Delete", R.string.Delete)));

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Fri Nov 20 09:53:27 UTC 2020
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME