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

Fix trojan sni config #330

This commit is contained in:
世界 2021-01-13 15:02:57 +08:00
parent 3a5a24b67d
commit 1844341d87
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
7 changed files with 75 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TMessagesProj/src/main/java/com/v2ray/ang/dto/AngConfig.kt
View File

@ -61,9 +61,10 @@ data class AngConfig(
} else if (configType == V2RayConfig.EConfigType.Trojan) {
val params = if (requestHost.isNotBlank()) "?sni=" + Utils.urlEncode(requestHost) else ""
val remark = if (remarks.isNotBlank()) "#" + Utils.urlEncode(remarks) else ""
return TROJAN_PROTOCOL + Utils.urlEncode(id) + "@" + address + ":" + port + remark
return TROJAN_PROTOCOL + Utils.urlEncode(id) + "@" + address + ":" + port + params + remark
} else {

5
TMessagesProj/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt
View File

@ -94,8 +94,9 @@ data class V2rayConfig(
data class HttpsettingsBean(var host: List<String> = ArrayList(), var path: String = "")
data class TlssettingsBean(var allowInsecure: Boolean = true,
var serverName: String = "")
data class TlssettingsBean(var serverName: String = "",
var allowInsecure: Boolean = false,
var allowInsecureCiphers: Boolean = false)
data class QuicsettingBean(var security: String = "none",
var key: String = "",

17
TMessagesProj/src/main/java/com/v2ray/ang/util/V2rayConfigUtil.kt
View File

@ -8,6 +8,8 @@ import com.google.gson.JsonObject
import com.v2ray.ang.V2RayConfig
import com.v2ray.ang.dto.AngConfig.VmessBean
import com.v2ray.ang.dto.V2rayConfig
import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean
import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean.TlssettingsBean
import org.json.JSONArray
import org.json.JSONException
import org.json.JSONObject
@ -126,16 +128,12 @@ object V2rayConfigUtil {
outbound.streamSettings = V2rayConfig.OutboundBean.StreamSettingsBean(
"tcp",
"tls",
null,null,null,null,
V2rayConfig.OutboundBean.StreamSettingsBean.TlssettingsBean(
false
),null
)
"tls", null,null,null,null,
TlssettingsBean(vmess.requestHost), null)
outbound.settings?.vnext = null
outbound.settings = V2rayConfig.OutboundBean.OutSettingsBean(null, listOf(V2rayConfig.OutboundBean.OutSettingsBean.ServersBean(
outbound.settings = OutSettingsBean(null, listOf(OutSettingsBean.ServersBean(
vmess.address,
vmess.id,
vmess.port,
@ -146,6 +144,7 @@ object V2rayConfigUtil {
outbound.mux?.enabled = false
outbound.protocol = "trojan"
}
else -> {
}
@ -205,7 +204,7 @@ object V2rayConfigUtil {
}
streamSettings.wssettings = wssettings
val tlssettings = V2rayConfig.OutboundBean.StreamSettingsBean.TlssettingsBean()
val tlssettings = TlssettingsBean()
tlssettings.allowInsecure = true
if (!TextUtils.isEmpty(host)) {
tlssettings.serverName = host
@ -223,7 +222,7 @@ object V2rayConfigUtil {
httpsettings.path = path
streamSettings.httpsettings = httpsettings
val tlssettings = V2rayConfig.OutboundBean.StreamSettingsBean.TlssettingsBean()
val tlssettings = TlssettingsBean()
tlssettings.allowInsecure = true
streamSettings.tlssettings = tlssettings
}

116
TMessagesProj/src/main/java/org/telegram/ui/ProfileNotificationsActivity.java
View File

@ -92,8 +92,6 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
private int priorityRow;
private int priorityInfoRow;
private int popupRow;
private int popupEnabledRow;
private int popupDisabledRow;
private int popupInfoRow;
private int callsRow;
private int ringtoneRow;
@ -102,6 +100,13 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
private int ledRow;
private int colorRow;
private int ledInfoRow;
private int disableMentionNotificationsRow;
private int disableMentionNotificationsInfoRow;
private int disablePinnedNotificationsRow;
private int disablePinnedNotificationsInfoRow;
private int rowCount;
private final static int done_button = 1;
@ -155,22 +160,20 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
}
priorityInfoRow = rowCount++;
boolean isChannel;
boolean isPrivate = false;
int lower_id = (int) dialog_id;
if (lower_id < 0) {
TLRPC.Chat chat = MessagesController.getInstance(currentAccount).getChat(-lower_id);
isChannel = ChatObject.isChannel(chat) && !chat.megagroup;
} else {
isChannel = false;
isPrivate = true;
}
if (lower_id != 0 && !isChannel) {
popupRow = rowCount++;
popupEnabledRow = rowCount++;
popupDisabledRow = rowCount++;
popupInfoRow = rowCount++;
} else {
popupRow = -1;
popupEnabledRow = -1;
popupDisabledRow = -1;
popupInfoRow = -1;
}
@ -457,8 +460,8 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
int notifyMaxCount1 = position1 % 10 + 1;
int notifyDelay1 = position1 / 10 + 1;
SharedPreferences preferences1 = MessagesController.getNotificationsSettings(currentAccount);
preferences1.edit().putInt("smart_max_count_" + dialog_id, notifyMaxCount1).commit();
preferences1.edit().putInt("smart_delay_" + dialog_id, notifyDelay1 * 60).commit();
preferences1.edit().putInt("smart_max_count_" + dialog_id, notifyMaxCount1).apply();
preferences1.edit().putInt("smart_delay_" + dialog_id, notifyDelay1 * 60).apply();
if (adapter != null) {
adapter.notifyItemChanged(smartRow);
}
@ -470,7 +473,7 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
builder.setPositiveButton(LocaleController.getString("Cancel", R.string.Cancel), null);
builder.setNegativeButton(LocaleController.getString("SmartNotificationsDisabled", R.string.SmartNotificationsDisabled), (dialog, which) -> {
SharedPreferences preferences12 = MessagesController.getNotificationsSettings(currentAccount);
preferences12.edit().putInt("smart_max_count_" + dialog_id, 0).commit();
preferences12.edit().putInt("smart_max_count_" + dialog_id, 0).apply();
if (adapter != null) {
adapter.notifyItemChanged(smartRow);
}
@ -486,22 +489,23 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
adapter.notifyItemChanged(colorRow);
}
}));
} else if (position == popupEnabledRow) {
} else if (position == popupRow) {
SharedPreferences preferences = MessagesController.getNotificationsSettings(currentAccount);
preferences.edit().putInt("popup_" + dialog_id, 1).commit();
((RadioCell) view).setChecked(true, true);
view = listView.findViewWithTag(2);
if (view != null) {
((RadioCell) view).setChecked(false, true);
}
} else if (position == popupDisabledRow) {
SharedPreferences preferences = MessagesController.getNotificationsSettings(currentAccount);
preferences.edit().putInt("popup_" + dialog_id, 2).commit();
((RadioCell) view).setChecked(true, true);
view = listView.findViewWithTag(1);
if (view != null) {
((RadioCell) view).setChecked(false, true);
int popup = preferences.getInt("popup_" + dialog_id, 0);
if (popup == -1) {
popup = preferences.getInt((int) dialog_id < 0 ? "popupGroup" : "popupAll", 0);
if (popup != 0) {
popup = 1;
} else {
popup = 2;
}
}
if (popup == 1) popup = 2;
else popup = 1;
preferences.edit().putInt("popup_" + dialog_id, popup).apply();
((TextCheckCell) view).setChecked(popup == 1);
adapter.notifyItemChanged(position);
}
}
}
@ -602,13 +606,8 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
textCell.setEnabled(customEnabled && notificationsEnabled, animators);
break;
}
case 4: {
RadioCell radioCell = (RadioCell) holder.itemView;
radioCell.setEnabled(customEnabled && notificationsEnabled, animators);
break;
}
case 8: {
if (position == previewRow) {
if (position == previewRow || position == popupRow) {
TextCheckCell checkCell = (TextCheckCell) holder.itemView;
checkCell.setEnabled(customEnabled && notificationsEnabled, animators);
}
@ -651,12 +650,10 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
@Override
public boolean isEnabled(RecyclerView.ViewHolder holder) {
int position = holder.getAdapterPosition();
switch (holder.getItemViewType()) {
case 1:
case 3:
case 4: {
return customEnabled && notificationsEnabled;
}
case 0:
case 2:
case 6:
@ -664,8 +661,7 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
return false;
}
case 8: {
TextCheckCell checkCell = (TextCheckCell) holder.itemView;
if (holder.getAdapterPosition() == previewRow) {
if (position == previewRow || position == popupRow) {
return customEnabled && notificationsEnabled;
} else {
return true;
@ -694,10 +690,6 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
view = new TextColorCell(context);
view.setBackgroundColor(Theme.getColor(Theme.key_windowBackgroundWhite));
break;
case 4:
view = new RadioCell(context);
view.setBackgroundColor(Theme.getColor(Theme.key_windowBackgroundWhite));
break;
case 5:
view = new TextCheckBoxCell(context);
view.setBackgroundColor(Theme.getColor(Theme.key_windowBackgroundWhite));
@ -726,8 +718,6 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
HeaderCell headerCell = (HeaderCell) holder.itemView;
if (position == generalRow) {
headerCell.setText(LocaleController.getString("General", R.string.General));
} else if (position == popupRow) {
headerCell.setText(LocaleController.getString("ProfilePopupNotification", R.string.ProfilePopupNotification));
} else if (position == ledRow) {
headerCell.setText(LocaleController.getString("NotificationsLed", R.string.NotificationsLed));
} else if (position == callsRow) {
@ -843,27 +833,6 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
textCell.setTextAndColor(LocaleController.getString("NotificationsLedColor", R.string.NotificationsLedColor), color, false);
break;
}
case 4: {
RadioCell radioCell = (RadioCell) holder.itemView;
SharedPreferences preferences = MessagesController.getNotificationsSettings(currentAccount);
int popup = preferences.getInt("popup_" + dialog_id, 0);
if (popup == 0) {
popup = preferences.getInt((int) dialog_id < 0 ? "popupGroup" : "popupAll", 0);
if (popup != 0) {
popup = 1;
} else {
popup = 2;
}
}
if (position == popupEnabledRow) {
radioCell.setText(LocaleController.getString("PopupEnabled", R.string.PopupEnabled), popup == 1, true);
radioCell.setTag(1);
} else if (position == popupDisabledRow) {
radioCell.setText(LocaleController.getString("PopupDisabled", R.string.PopupDisabled), popup == 2, false);
radioCell.setTag(2);
}
break;
}
case 5: {
TextCheckBoxCell cell = (TextCheckBoxCell) holder.itemView;
SharedPreferences preferences = MessagesController.getNotificationsSettings(currentAccount);
@ -889,6 +858,17 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
checkCell.setTextAndCheck(LocaleController.getString("Notifications", R.string.Notifications), notificationsEnabled, true);
} else if (position == previewRow) {
checkCell.setTextAndCheck(LocaleController.getString("MessagePreview", R.string.MessagePreview), preferences.getBoolean("content_preview_" + dialog_id, true), true);
} else if (position == popupRow) {
int popup = preferences.getInt("popup_" + dialog_id, 0);
if (popup == 0) {
popup = preferences.getInt((int) dialog_id < 0 ? "popupGroup" : "popupAll", 0);
if (popup != 0) {
popup = 1;
} else {
popup = 2;
}
}
checkCell.setTextAndCheck(LocaleController.getString("ProfilePopupNotification", R.string.ProfilePopupNotification), popup == 1, false);
}
break;
}
@ -897,6 +877,7 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
@Override
public void onViewAttachedToWindow(RecyclerView.ViewHolder holder) {
int position = holder.getAdapterPosition();
if (holder.getItemViewType() != 0) {
switch (holder.getItemViewType()) {
case 1: {
@ -914,14 +895,9 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
textCell.setEnabled(customEnabled && notificationsEnabled, null);
break;
}
case 4: {
RadioCell radioCell = (RadioCell) holder.itemView;
radioCell.setEnabled(customEnabled && notificationsEnabled, null);
break;
}
case 8: {
TextCheckCell checkCell = (TextCheckCell) holder.itemView;
if (holder.getAdapterPosition() == previewRow) {
if (position == previewRow || position == popupRow) {
checkCell.setEnabled(customEnabled && notificationsEnabled, null);
} else {
checkCell.setEnabled(true, null);
@ -933,7 +909,7 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
@Override
public int getItemViewType(int position) {
if (position == generalRow || position == popupRow || position == ledRow || position == callsRow) {
if (position == generalRow || position == ledRow || position == callsRow) {
return 0;
} else if (position == soundRow || position == vibrateRow || position == priorityRow || position == smartRow || position == ringtoneRow || position == callsVibrateRow) {
return 1;
@ -941,15 +917,13 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi
return 2;
} else if (position == colorRow) {
return 3;
} else if (position == popupEnabledRow || position == popupDisabledRow) {
return 4;
} else if (position == customRow) {
return 5;
} else if (position == avatarRow) {
return 6;
} else if (position == avatarSectionRow) {
return 7;
} else if (position == enableRow || position == previewRow) {
} else if (position == enableRow || position == previewRow || position == popupRow) {
return 8;
}
return 0;

15
TMessagesProj/src/main/java/tw/nekomimi/nekogram/TrojanSettingsActivity.java
View File

@ -54,6 +54,7 @@ public class TrojanSettingsActivity extends BaseFragment {
private EditTextBoldCursor ipField;
private EditTextBoldCursor portField;
private EditTextBoldCursor passwordField;
private EditTextBoldCursor sniField;
private EditTextBoldCursor remarksField;
private ScrollView scrollView;
@ -191,6 +192,7 @@ public class TrojanSettingsActivity extends BaseFragment {
currentBean.setAddress(ipField.getText().toString());
currentBean.setPort(Utilities.parseInt(portField.getText().toString()));
currentBean.setId(passwordField.getText().toString());
currentBean.setRequestHost(sniField.getText().toString());
currentBean.setRemarks(remarksField.getText().toString());
if (currentProxyInfo == null) {
@ -237,9 +239,9 @@ public class TrojanSettingsActivity extends BaseFragment {
}
linearLayout2.addView(inputFieldsContainer, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT));
inputFields = new EditTextBoldCursor[7];
inputFields = new EditTextBoldCursor[5];
for (int a = 0; a < 4; a++) {
for (int a = 0; a < 5; a++) {
FrameLayout container = new FrameLayout(context);
EditTextBoldCursor cursor = mkCursor();
inputFields[a] = cursor;
@ -263,12 +265,18 @@ public class TrojanSettingsActivity extends BaseFragment {
cursor.setHintText(LocaleController.getString("SSPassword", R.string.SSPassword));
cursor.setText(currentBean.getId());
break;
case 3:
case 3:
remarksField = cursor;
cursor.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
cursor.setHintText(LocaleController.getString("ProxyRemarks", R.string.ProxyRemarks));
cursor.setText(currentBean.getRemarks());
break;
case 4:
sniField = cursor;
cursor.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
cursor.setHintText(LocaleController.getString("TrojanSNI", R.string.TrojanSNI));
cursor.setText(currentBean.getRequestHost());
break;
}
cursor.setSelection(cursor.length());
@ -280,6 +288,7 @@ public class TrojanSettingsActivity extends BaseFragment {
inputFieldsContainer.addView((View) ipField.getParent(), LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 64));
inputFieldsContainer.addView((View) portField.getParent(), LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 64));
inputFieldsContainer.addView((View) passwordField.getParent(), LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 64));
inputFieldsContainer.addView((View) sniField.getParent(), LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 64));
inputFieldsContainer.addView((View) remarksField.getParent(), LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, 64));
bottomCell = new TextInfoPrivacyCell(context);

1
TMessagesProj/src/main/java/tw/nekomimi/nekogram/VmessLoader.kt
View File

@ -151,6 +151,7 @@ class VmessLoader {
}
vmess.requestHost = link.queryParameter("sni") ?: vmess.requestHost
vmess.remarks = link.fragment ?: ""
return vmess

4
TMessagesProj/src/main/res/values/strings_nekox.xml
View File

@ -171,6 +171,7 @@
<string name="SSRObfsParam">Obfs Param</string>
<string name="ProxyInfoTrojan">Trojan Proxy Settings</string>
<string name="TrojanSNI">SNI (Optional)</string>
<string name="ProxyRemarks">Remarks</string>
<string name="RetestPing">Retest ping for all servers</string>
@ -270,4 +271,7 @@
<string name="TabletMode">Tablet mode</string>
<string name="TabletModeDefault">Depends on device</string>
<string name="PersonalNotifications">Local Notifications</string>
<string name="PersonalNotificationsInfo">Pinned message</string>
</resources>