mirror of https://github.com/NekoX-Dev/NekoX.git
Rewrite LocationActivity changes to osmdroid
This commit is contained in:
parent
e5d871e999
commit
5535ebc0cd
|
@ -5,8 +5,8 @@ apply plugin: 'com.android.application'
|
||||||
apply plugin: 'kotlin-android'
|
apply plugin: 'kotlin-android'
|
||||||
apply plugin: 'kotlin-android-extensions'
|
apply plugin: 'kotlin-android-extensions'
|
||||||
|
|
||||||
def verName = "7.2.1-preview05"
|
def verName = "7.2.1-preview06"
|
||||||
def verCode = 98
|
def verCode = 100
|
||||||
|
|
||||||
def serviceAccountCredentialsFile = rootProject.file("service_account_credentials.json")
|
def serviceAccountCredentialsFile = rootProject.file("service_account_credentials.json")
|
||||||
|
|
||||||
|
|
|
@ -20996,17 +20996,17 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
|
||||||
if (!AndroidUtilities.isGoogleMapsInstalled(ChatActivity.this)) {
|
if (!AndroidUtilities.isGoogleMapsInstalled(ChatActivity.this)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
/*if (message.isLiveLocation()) {
|
if (message.isLiveLocation()) {
|
||||||
LocationActivity fragment = new LocationActivity(currentChat == null || ChatObject.canSendMessages(currentChat) || currentChat.megagroup ? 2 : LocationActivity.LOCATION_TYPE_LIVE_VIEW);
|
LocationActivity fragment = new LocationActivity(currentChat == null || ChatObject.canSendMessages(currentChat) || currentChat.megagroup ? 2 : LocationActivity.LOCATION_TYPE_LIVE_VIEW);
|
||||||
fragment.setDelegate(ChatActivity.this);
|
fragment.setDelegate(ChatActivity.this);
|
||||||
fragment.setMessageObject(message);
|
fragment.setMessageObject(message);
|
||||||
presentFragment(fragment);
|
presentFragment(fragment);
|
||||||
} else {*/
|
} else {
|
||||||
LocationActivity fragment = new LocationActivity(currentEncryptedChat == null ? 3 : 0);
|
LocationActivity fragment = new LocationActivity(currentEncryptedChat == null ? 3 : 0);
|
||||||
fragment.setDelegate(ChatActivity.this);
|
fragment.setDelegate(ChatActivity.this);
|
||||||
fragment.setMessageObject(message);
|
fragment.setMessageObject(message);
|
||||||
presentFragment(fragment);
|
presentFragment(fragment);
|
||||||
//}
|
}
|
||||||
} else if (message.type == 9 || message.type == 0) {
|
} else if (message.type == 9 || message.type == 0) {
|
||||||
File locFile = null;
|
File locFile = null;
|
||||||
if (message.messageOwner.attachPath != null && message.messageOwner.attachPath.length() != 0) {
|
if (message.messageOwner.attachPath != null && message.messageOwner.attachPath.length() != 0) {
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
V2RAY_CORE_VERSION="4.31.3"
|
V2RAY_CORE_VERSION="4.32.0"
|
||||||
|
|
||||||
if [ ! -x "$(command -v go)" ]; then
|
if [ ! -x "$(command -v go)" ]; then
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue