Skip to content

Commit 7b627cf

Browse files
androidacy-userandroidacy-user
committed
2.3.7
Signed-off-by: androidacy-user <opensource@androidacy.com>
1 parent c537583 commit 7b627cf

11 files changed

Lines changed: 73 additions & 73 deletions

File tree

‎app/build.gradle.kts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ plugins {
1313
id("com.mikepenz.aboutlibraries.plugin")
1414
kotlin("android")
1515
kotlin("kapt")
16-
id("com.google.devtools.ksp") version "1.9.10-1.0.13"
16+
id("com.google.devtools.ksp") version "1.9.23-1.0.19"
1717
}
1818
android {
1919
// functions to get git info: gitCommitHash, gitBranch, gitRemote
@@ -48,8 +48,8 @@ android {
4848
applicationId = "com.fox2code.mmm"
4949
minSdk = 26
5050
targetSdk = 34
51-
versionCode = 91
52-
versionName = "2.3.6"
51+
versionCode = 92
52+
versionName = "2.3.7"
5353
vectorDrawables {
5454
useSupportLibrary = true
5555
}
@@ -100,7 +100,7 @@ android {
100100
// Specifies a list of ABIs for Gradle to create APKs for.
101101
include("x86", "x86_64", "arm64-v8a", "armeabi-v7a")
102102

103-
isUniversalApk = false
103+
isUniversalApk = true
104104
}
105105
}
106106

@@ -372,9 +372,9 @@ dependencies {
372372
// logging interceptor
373373
debugImplementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.12")
374374
// Chromium cronet from androidacy
375-
implementation("org.chromium.net:cronet-embedded:113.5672.61")
375+
implementation("org.chromium.net:cronet-embedded:119.6045.31")
376376

377-
val libsuVersion = "5.2.1"
377+
val libsuVersion = "5.2.2"
378378
// The core module that provides APIs to a shell
379379
implementation("com.github.topjohnwu.libsu:core:${libsuVersion}")
380380

@@ -406,10 +406,10 @@ dependencies {
406406

407407
// some utils
408408
implementation("commons-io:commons-io:2.15.1")
409-
implementation("org.apache.commons:commons-compress:1.26.0")
409+
implementation("org.apache.commons:commons-compress:1.26.1")
410410

411411
// analytics
412-
implementation("ly.count.android:sdk:23.8.4")
412+
implementation("ly.count.android:sdk:24.1.1")
413413

414414
// annotations
415415
implementation("org.jetbrains:annotations-java5:24.1.0")

‎app/src/main/kotlin/com/fox2code/mmm/MainApplication.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ class MainApplication : Application(), Configuration.Provider, ActivityLifecycle
281281
} else {
282282
val config = CountlyConfig(
283283
this,
284-
"ff1dc022295f64a7a5f6a5ca07c0294400c71b60",
284+
"25145081ac0b5e2beb1e9320ab714285a45ad2d3",
285285
"https://ctly.androidacy.com"
286286
)
287287
if (isCrashReportingEnabled) {

‎app/src/main/kotlin/com/fox2code/mmm/utils/io/net/Http.kt‎

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -254,35 +254,14 @@ enum class Http {;
254254
val httpclientBuilder = OkHttpClient.Builder()
255255
// Default is 10, extend it a bit for slow mobile connections.
256256
httpclientBuilder.connectTimeout(5, TimeUnit.SECONDS)
257-
httpclientBuilder.writeTimeout(10, TimeUnit.SECONDS)
258-
httpclientBuilder.readTimeout(15, TimeUnit.SECONDS)
257+
httpclientBuilder.writeTimeout(5, TimeUnit.SECONDS)
258+
httpclientBuilder.readTimeout(5, TimeUnit.SECONDS)
259259
httpclientBuilder.proxy(Proxy.NO_PROXY) // Do not use system proxy
260-
var dns = Dns.SYSTEM
260+
// TODO: Make compatible w/ cronet
261+
// var dns = Dns.SYSTEM
261262
try {
262-
val cloudflareBootstrap = arrayOf(
263-
InetAddress.getByName("162.159.36.1"),
264-
InetAddress.getByName("162.159.46.1"),
265-
InetAddress.getByName("1.1.1.1"),
266-
InetAddress.getByName("1.0.0.1"),
267-
InetAddress.getByName("162.159.132.53"),
268-
InetAddress.getByName("2606:4700:4700::1111"),
269-
InetAddress.getByName("2606:4700:4700::1001"),
270-
InetAddress.getByName("2606:4700:4700::0064"),
271-
InetAddress.getByName("2606:4700:4700::6400")
272-
)
273-
dns = Dns { s: String? ->
274-
if ("cloudflare-dns.com" == s) {
275-
return@Dns listOf<InetAddress>(*cloudflareBootstrap)
276-
}
277-
Dns.SYSTEM.lookup(s!!)
278-
}
279-
httpclientBuilder.dns(dns)
280263
val cookieJar = WebkitCookieManagerProxy()
281264
httpclientBuilder.cookieJar(cookieJar)
282-
dns = DnsOverHttps.Builder().client(httpclientBuilder.build())
283-
.url("https://cloudflare-dns.com/dns-query".toHttpUrl()).bootstrapDnsHosts(
284-
*cloudflareBootstrap
285-
).build()
286265
} catch (e: UnknownHostException) {
287266
Timber.e(e, "Failed to init DoH")
288267
} catch (e: RuntimeException) {
@@ -381,7 +360,7 @@ enum class Http {;
381360
// Gracefully fallback to okhttp
382361
}
383362
// Fallback DNS cache responses in case request fail but already succeeded once in the past
384-
fallbackDNS = FallBackDNS(
363+
/* fallbackDNS = FallBackDNS(
385364
dns,
386365
"github.com",
387366
"api.github.com",
@@ -395,23 +374,12 @@ enum class Http {;
395374
"api.androidacy.com",
396375
"production-api.androidacy.com"
397376
)
398-
httpclientBuilder.dns(Dns.SYSTEM)
377+
httpclientBuilder.dns(Dns.SYSTEM)*/
399378
httpClient = followRedirects(httpclientBuilder, true).build()
400379
followRedirects(httpclientBuilder, false).build()
401-
httpclientBuilder.dns(fallbackDNS!!)
402380
httpClientDoH = followRedirects(httpclientBuilder, true).build()
403381
followRedirects(httpclientBuilder, false).build()
404-
httpclientBuilder.cache(
405-
Cache(
406-
File(
407-
mainApplication.cacheDir, "http_cache"
408-
), 16L * 1024L * 1024L
409-
)
410-
) // 16Mib of cache
411-
httpclientBuilder.dns(Dns.SYSTEM)
412382
httpClientWithCache = followRedirects(httpclientBuilder, true).build()
413-
httpclientBuilder.dns(fallbackDNS!!)
414-
httpClientWithCacheDoH = followRedirects(httpclientBuilder, true).build()
415383
if (MainApplication.forceDebugLogging) Timber.i("Initialized Http successfully!")
416384
doh = MainApplication.isDohEnabled
417385
}

‎app/src/main/res/raw/gh_main_crt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIID0zCCArugAwIBAgIQVmcdBOpPmUxvEIFHWdJ1lDANBgkqhkiG9w0BAQwFADB7
3+
MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD
4+
VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE
5+
AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTE5MDMxMjAwMDAwMFoXDTI4
6+
MTIzMTIzNTk1OVowgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5
7+
MRQwEgYDVQQHEwtKZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBO
8+
ZXR3b3JrMS4wLAYDVQQDEyVVU0VSVHJ1c3QgRUNDIENlcnRpZmljYXRpb24gQXV0
9+
aG9yaXR5MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEGqxUWqn5aCPnetUkb1PGWthL
10+
q8bVttHmc3Gu3ZzWDGH926CJA7gFFOxXzu5dP+Ihs8731Ip54KODfi2X0GHE8Znc
11+
JZFjq38wo7Rw4sehM5zzvy5cU7Ffs30yf4o043l5o4HyMIHvMB8GA1UdIwQYMBaA
12+
FKARCiM+lvEH7OKvKe+CpX/QMKS0MB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1
13+
xmNjmjAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zARBgNVHSAECjAI
14+
MAYGBFUdIAAwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5j
15+
b20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNAYIKwYBBQUHAQEEKDAmMCQG
16+
CCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wDQYJKoZIhvcNAQEM
17+
BQADggEBABns652JLCALBIAdGN5CmXKZFjK9Dpx1WywV4ilAbe7/ctvbq5AfjJXy
18+
ij0IckKJUAfiORVsAYfZFhr1wHUrxeZWEQff2Ji8fJ8ZOd+LygBkc7xGEJuTI42+
19+
FsMuCIKchjN0djsoTI0DQoWz4rIjQtUfenVqGtF8qmchxDM6OW1TyaLtYiKou+JV
20+
bJlsQ2uRl9EMC5MCHdK8aXdJ5htN978UeAOwproLtOGFfy/cQjutdAFI3tZs4RmY
21+
CV4Ks2dH/hzg1cEo70qLRDEmBDeNiXQ2Lu+lIg+DdEmSx/cQwgwp+7e9un/jX9Wf
22+
8qn0dNW44bOwgeThpWOjzOoEeJBuv/c=
23+
-----END CERTIFICATE-----

‎app/src/main/res/xml/network_security_config.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
</domain-config>
1212
<domain-config cleartextTrafficPermitted="false">
1313
<domain includeSubdomains="true">github.com</domain>
14+
<trust-anchors>
15+
<certificates src="@raw/gh_main_crt" />
16+
</trust-anchors>
17+
</domain-config>
18+
<domain-config cleartextTrafficPermitted="false">
1419
<domain includeSubdomains="true">githubusercontent.com</domain>
1520
<trust-anchors>
1621
<certificates src="@raw/gh_root_ca" />
@@ -34,4 +39,4 @@
3439
<certificates src="@raw/sentry_io_root_ca" />
3540
</trust-anchors>
3641
</domain-config>
37-
</network-security-config>
42+
</network-security-config>

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ buildscript {
1313
gradlePluginPortal()
1414
}
1515
dependencies {
16-
classpath("com.android.tools.build:gradle:8.2.0")
17-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10")
16+
classpath("com.android.tools.build:gradle:8.3.0")
17+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
1818
classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:11.1.0")
1919
}
2020
}

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
# org.gradle.parallel=true
1313
#Tue Jul 18 21:42:11 EDT 2023
1414
#android.defaults.buildfeatures.buildconfig=true
15-
android.enableJetifier=true
15+
android.enableJetifier=false
1616
android.enableR8.fullMode=true
1717
android.useAndroidX=true
1818
org.gradle.caching=true
1919
org.gradle.configuration-cache=false # temporarily disabled due to https://github.com/getsentry/sentry-android-gradle-plugin/issues/554
2020
org.gradle.configuration-cache.problems=warn
2121
org.gradle.jvmargs=-Xmx1536M -Dorg.gradle.android.cache-fix.ignoreVersionCheck\=true -Dkotlin.daemon.jvm.options\="-Xmx1536M" -Dfile.encoding\=UTF-8 -XX\:+UseParallelGC -XX\:ReservedCodeCacheSize\=768m
22-
org.gradle.parallel=true
22+
org.gradle.parallel=true

‎gradle/wrapper/gradle-wrapper.jar‎

-18.2 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#Mon Jul 03 11:59:05 EDT 2023
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
54
networkTimeout=10000
5+
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
77
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)