Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Imre Kristoffer Eilertsen
Nebulo
Commits
bb434bde
Commit
bb434bde
authored
Jun 06, 2021
by
Daniel Wolf
Browse files
Do not use cronet in fdroidofficial flavor
parent
8aa2c951
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/build.gradle
View file @
bb434bde
...
...
@@ -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'
...
...
app/src/
main
/java/com/frostnerd/smokescreen/QuicEngineImpl.kt
→
app/src/
cronet
/java/com/frostnerd/smokescreen/QuicEngineImpl.kt
View file @
bb434bde
File moved
app/src/fdroidofficial/java/com/frostnerd/smokescreen/QuicEngineImpl.kt
0 → 100644
View file @
bb434bde
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment