Commit bb434bde authored by Daniel Wolf's avatar Daniel Wolf
Browse files

Do not use cronet in fdroidofficial flavor

parent 8aa2c951
......@@ -55,11 +55,6 @@ android {
keyPassword getSystemVariableOrDefault("KEYSTORE_KEY_PASSWORD", "")
}
}
sourceSets {
androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
debug.assets.srcDirs += files("$projectDir/schemas".toString())
fdroidofficial.res.srcDirs += "src/fdroid/res"
}
buildTypes {
release {
minifyEnabled true
......@@ -104,6 +99,17 @@ android {
versionCode 79
}
}
sourceSets {
androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
debug.assets.srcDirs += files("$projectDir/schemas".toString())
fdroidofficial.res.srcDirs += "src/fdroid/res"
fdroidofficial.java.srcDirs += "src/fdroidofficial/java"
fdroidofficial.java.srcDirs += "src/fdroidofficial/res"
fdroid.java.srcDirs += "src/cronet/java"
store {
java.srcDirs += "src/cronet/java"
}
}
packagingOptions {
exclude 'META-INF/library_release.kotlin_module'
}
......@@ -152,7 +158,8 @@ dependencies {
implementation 'com.frostnerd.utilskt:general:1.0.26' // https://git.frostnerd.com/AndroidUtils/generalkt
implementation 'com.frostnerd.utilskt:adapters:1.3.5' // https://git.frostnerd.com/AndroidUtils/Adapters
implementation 'com.google.android.gms:play-services-cronet:17.0.0'
storeImplementation 'com.google.android.gms:play-services-cronet:17.0.0'
fdroidImplementation 'com.google.android.gms:play-services-cronet:17.0.0'
implementation 'androidx.work:work-runtime:2.5.0'
implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
......
package com.frostnerd.smokescreen
import android.content.Context
import com.frostnerd.encrypteddnstunnelproxy.QuicEngine
import com.frostnerd.encrypteddnstunnelproxy.quic.QuicUpstreamAddress
import java.net.URL
import java.net.URLConnection
/*
* Copyright (C) 2021 Daniel Wolf (Ch4t4r)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* You can contact the developer at daniel.wolf@frostnerd.com.
*/
class QuicEngineImpl(context: Context, private val quicOnly:Boolean, vararg addresses:QuicUpstreamAddress):QuicEngine(context, *addresses) {
// NO-OP Implementation.
companion object {
val providerInstalled = false
fun installNetworkEngine(context: Context, onSuccess:(() -> Unit)? = null) {
}
}
override fun openConnection(url: URL): URLConnection {
error("NOIMPL")
}
override fun shutdown() {
error("NOIMPL")
}
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment