andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-22 02:01:08 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Tematory disable firebase

Browse Source
This commit is contained in:
Mykola Baibuz
2023-03-16 19:44:27 -04:00
parent 291263f96f
commit 88445dc8c4
5 changed files with 104 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/android/shadowsocks/build.gradle
+2
View File
@@ -86,3 +86,5 @@ dependencies {
kapt "androidx.room:room-compiler:2.5.0"
kapt "androidx.lifecycle:lifecycle-compiler:2.4.0"
}
apply plugin: 'com.google.gms.google-services'
client/android/shadowsocks/google-services.json
+69
View File
@@ -0,0 +1,69 @@
{
"project_info": {
"project_number": "94322785672",
"firebase_url": "https://amnezia-c6715-default-rtdb.europe-west1.firebasedatabase.app",
"project_id": "amnezia-c6715",
"storage_bucket": "amnezia-c6715.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:94322785672:android:ed42ab188d6edecf754e3d",
"android_client_info": {
"package_name": "org.amnezia.vpn"
}
},
"oauth_client": [
{
"client_id": "94322785672-p3q726tro36fr9nluj45l35gqv6nhjsq.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCvblU4w_NZbWk9bNQc-KGmg-WODjbb308"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "94322785672-p3q726tro36fr9nluj45l35gqv6nhjsq.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:94322785672:android:95e8779ff76d6641754e3d",
"android_client_info": {
"package_name": "org.amnezia.vpn.shadowsocks.core"
}
},
"oauth_client": [
{
"client_id": "94322785672-p3q726tro36fr9nluj45l35gqv6nhjsq.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCvblU4w_NZbWk9bNQc-KGmg-WODjbb308"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "94322785672-p3q726tro36fr9nluj45l35gqv6nhjsq.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}
client/android/shadowsocks/src/main/AndroidManifest.xml
+29 -6
View File
@@ -7,12 +7,21 @@
android:name="android.hardware.touchscreen"
android:required="false" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="28"/>
<queries>
<intent>
<action android:name="com.github.shadowsocks.plugin.ACTION_NATIVE_PLUGIN" />
</intent>
</queries>
<application
@@ -75,6 +84,7 @@
<action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
</intent-filter>
</receiver>
<!-- https://android.googlesource.com/platform/frameworks/support/+/androidx-master-dev/work/workmanager/src/main/AndroidManifest.xml -->
<provider
@@ -128,5 +138,18 @@
android:directBootAware="true"
android:process=":QtOnlyProcess"
tools:replace="android:directBootAware" />
<service android:name="com.google.firebase.components.ComponentDiscoveryService"
android:process=":QtOnlyProcess"
android:directBootAware="true"/>
<provider android:name="com.google.firebase.provider.FirebaseInitProvider"
android:process=":QtOnlyProcess"
tools:node="remove"/>
<service android:name="androidx.room.MultiInstanceInvalidationService"
android:process=":bg"/>
</application>
</manifest>
client/android/shadowsocks/src/main/java/org/amnezia/vpn/shadowsocks/core/Core.kt
+2 -2
View File
@@ -111,7 +111,7 @@ object Core : Configuration.Provider {
// overhead of debug mode is minimal: https://github.com/Kotlin/kotlinx.coroutines/blob/f528898/docs/debugging.md#debug-mode
System.setProperty(DEBUG_PROPERTY_NAME, DEBUG_PROPERTY_VALUE_ON)
Firebase.initialize(deviceStorage) // multiple processes needs manual set-up
/* Firebase.initialize(deviceStorage) // multiple processes needs manual set-up
Timber.plant(object : Timber.DebugTree() {
override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
if (t == null) {
@@ -122,7 +122,7 @@ object Core : Configuration.Provider {
if (priority >= Log.INFO) FirebaseCrashlytics.getInstance().recordException(t)
}
}
})
})*/
// handle data restored/crash
if (Build.VERSION.SDK_INT >= 24 && DataStore.directBootAware && user.isUserUnlocked) {
client/android/shadowsocks/src/main/java/org/amnezia/vpn/shadowsocks/core/bg/BaseService.kt
+2 -2
View File
@@ -269,7 +269,7 @@ object BaseService {
// channge the state
data.changeState(State.Stopping)
GlobalScope.launch(Dispatchers.Main.immediate) {
Firebase.analytics.logEvent("stop") { param(FirebaseAnalytics.Param.METHOD, tag) }
//Firebase.analytics.logEvent("stop") { param(FirebaseAnalytics.Param.METHOD, tag) }
data.connectingJob?.cancelAndJoin() // ensure stop connecting first
this@Interface as Service
// we use a coroutineScope here to allow clean-up in parallel
@@ -344,7 +344,7 @@ object BaseService {
}
// data.notification = createNotification(profile.formattedName)
Firebase.analytics.logEvent("start") { param(FirebaseAnalytics.Param.METHOD, tag) }
//Firebase.analytics.logEvent("start") { param(FirebaseAnalytics.Param.METHOD, tag) }
data.changeState(State.Connecting)
data.connectingJob = GlobalScope.launch(Dispatchers.Main) {