Rewrite LocationActivity changes to osmdroid

This commit is contained in:
世界 2020-11-01 13:02:57 +00:00
parent e5d871e999
commit 5535ebc0cd
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
4 changed files with 696 additions and 127 deletions

View File

@ -5,8 +5,8 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
def verName = "7.2.1-preview05"
def verCode = 98
def verName = "7.2.1-preview06"
def verCode = 100
def serviceAccountCredentialsFile = rootProject.file("service_account_credentials.json")

View File

@ -20996,17 +20996,17 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
if (!AndroidUtilities.isGoogleMapsInstalled(ChatActivity.this)) {
return;
}
/*if (message.isLiveLocation()) {
if (message.isLiveLocation()) {
LocationActivity fragment = new LocationActivity(currentChat == null || ChatObject.canSendMessages(currentChat) || currentChat.megagroup ? 2 : LocationActivity.LOCATION_TYPE_LIVE_VIEW);
fragment.setDelegate(ChatActivity.this);
fragment.setMessageObject(message);
presentFragment(fragment);
} else {*/
} else {
LocationActivity fragment = new LocationActivity(currentEncryptedChat == null ? 3 : 0);
fragment.setDelegate(ChatActivity.this);
fragment.setMessageObject(message);
presentFragment(fragment);
//}
}
} else if (message.type == 9 || message.type == 0) {
File locFile = null;
if (message.messageOwner.attachPath != null && message.messageOwner.attachPath.length() != 0) {

View File

@ -1,6 +1,6 @@
#!/bin/bash
V2RAY_CORE_VERSION="4.31.3"
V2RAY_CORE_VERSION="4.32.0"
if [ ! -x "$(command -v go)" ]; then