Skip to content

Commit 1c3df10

Browse files
ismartcodingismartcoding
committed
ktlint -F
1 parent d0ac72a commit 1c3df10

File tree

715 files changed

+17911
-13309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

715 files changed

+17911
-13309
lines changed

‎app/build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ android {
6060
debug {
6161
applicationIdSuffix = ".debug"
6262
resValue("string", "app_name", "PlainApp-Debug")
63-
isShrinkResources = false
64-
isMinifyEnabled = false
63+
isShrinkResources = true
64+
isMinifyEnabled = true
6565
ndk {
6666
debugSymbolLevel = "SYMBOL_TABLE"
6767
}
@@ -96,7 +96,7 @@ android {
9696

9797
packaging {
9898
jniLibs {
99-
//useLegacyPackaging = true
99+
// useLegacyPackaging = true
100100
excludes += listOf("META-INF/*")
101101
}
102102
resources {

‎app/proguard-rules.pro

-16
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,9 @@
3232
-dontwarn io.netty.internal.tcnative.SSL
3333
-dontwarn io.netty.internal.tcnative.SSLContext
3434
-dontwarn io.netty.internal.tcnative.SSLPrivateKeyMethod
35-
-dontwarn io.netty.internal.tcnative.SSLSession
3635
-dontwarn io.netty.internal.tcnative.SSLSessionCache
3736
-dontwarn io.netty.internal.tcnative.SessionTicketKey
3837
-dontwarn io.netty.internal.tcnative.SniHostNameMatcher
39-
-dontwarn java.beans.ConstructorProperties
40-
-dontwarn java.beans.Transient
4138
-dontwarn java.lang.System$Logger$Level
4239
-dontwarn java.lang.System$Logger
4340
-dontwarn java.lang.management.ManagementFactory
@@ -60,16 +57,3 @@
6057
-dontwarn org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin
6158
-dontwarn pl.droidsonroids.gif.GifDrawable
6259
-dontwarn reactor.blockhound.integration.BlockHoundIntegration
63-
64-
-keep class com.apurebase.kgraphql.** { *; }
65-
-keep class com.ismartcoding.plain.databinding.** { *; }
66-
-keep class org.bouncycastle.** { *; }
67-
-keep interface org.bouncycastle.** { *; }
68-
69-
-keep class io.ktor.server.netty.EngineMain { *; }
70-
-keep class io.ktor.server.config.HoconConfigLoader { *; }
71-
-keep class com.ismartcoding.plain.web.HttpModuleKt { *; }
72-
-keep class com.ismartcoding.plain.MainApp { *; }
73-
-keep class com.ismartcoding.plain.services.HttpServerService { *; }
74-
-keep class kotlin.reflect.jvm.internal.** { *; }
75-
-keep class kotlin.text.RegexOption { *; }

‎app/src/main/java/com/ismartcoding/plain/MainApp.kt

+1-5
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,15 @@ import com.ismartcoding.plain.data.preference.WebPreference
3131
import com.ismartcoding.plain.data.preference.dataStore
3232
import com.ismartcoding.plain.features.AppEvents
3333
import com.ismartcoding.plain.features.bluetooth.BluetoothEvents
34-
import com.ismartcoding.plain.features.box.BoxEvents
3534
import com.ismartcoding.plain.features.pkg.PackageHelper
3635
import com.ismartcoding.plain.ui.helpers.PageHelper
3736
import com.ismartcoding.plain.web.HttpServerManager
3837
import com.ismartcoding.plain.workers.FeedFetchWorker
39-
import io.ktor.server.netty.NettyApplicationEngine
4038
import kotlinx.coroutines.flow.first
4139
import okhttp3.Dispatcher
4240
import okhttp3.OkHttpClient
4341

44-
4542
class MainApp : Application(), ImageLoaderFactory {
46-
4743
override fun newImageLoader(): ImageLoader {
4844
return ImageLoader.Builder(this)
4945
.components {
@@ -98,7 +94,7 @@ class MainApp : Application(), ImageLoaderFactory {
9894

9995
BluetoothEvents.register()
10096
AppEvents.register()
101-
//BoxEvents.register()
97+
// BoxEvents.register()
10298

10399
coIO {
104100
val preferences = dataStore.data.first()

‎app/src/main/java/com/ismartcoding/plain/SystemServices.kt

-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ package com.ismartcoding.plain
33
import android.app.usage.StorageStatsManager
44
import android.content.ClipboardManager
55
import android.content.ContentResolver
6-
import android.content.Context
7-
import android.content.SharedPreferences
86
import android.content.pm.PackageManager
97
import android.media.projection.MediaProjectionManager
108
import android.net.ConnectivityManager
@@ -14,8 +12,6 @@ import android.os.PowerManager
1412
import android.os.storage.StorageManager
1513
import android.view.inputmethod.InputMethodManager
1614
import androidx.core.app.NotificationManagerCompat
17-
import androidx.core.content.ContextCompat
18-
import java.util.concurrent.Executor
1915
import com.ismartcoding.lib.extensions.getSystemServiceCompat
2016

2117
val contentResolver: ContentResolver by lazy { MainApp.instance.contentResolver }

‎app/src/main/java/com/ismartcoding/plain/TempData.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.ismartcoding.plain
22

3-
import com.ismartcoding.lib.helpers.CryptoHelper
4-
53
object TempData {
64
var webEnabled = false
75
var demoMode = false
@@ -14,4 +12,4 @@ object TempData {
1412
var httpsPort: Int = 8443
1513
var urlToken = "" // use to encrypt or decrypt params in url
1614
var chatItemsMigrated = false
17-
}
15+
}

‎app/src/main/java/com/ismartcoding/plain/api/BoxApi.kt

+54-27
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import com.apollographql.apollo3.cache.normalized.normalizedCache
1212
import com.apollographql.apollo3.cache.normalized.sql.SqlNormalizedCacheFactory
1313
import com.apollographql.apollo3.exception.ApolloException
1414
import com.apollographql.apollo3.network.okHttpClient
15-
import com.ismartcoding.lib.logcat.LogCat
1615
import com.ismartcoding.lib.channel.sendEvent
16+
import com.ismartcoding.lib.logcat.LogCat
1717
import com.ismartcoding.plain.MainApp
18-
import com.ismartcoding.plain.features.BoxConnectivityStateChangedEvent
1918
import com.ismartcoding.plain.data.UIDataCache
2019
import com.ismartcoding.plain.db.DBox
20+
import com.ismartcoding.plain.features.BoxConnectivityStateChangedEvent
2121
import com.ismartcoding.plain.features.bluetooth.BluetoothUtil
2222
import com.ismartcoding.plain.features.bluetooth.SmartBTDevice
2323
import kotlinx.coroutines.sync.Mutex
@@ -27,7 +27,11 @@ object BoxApi {
2727
private var clients = mutableMapOf<String, ApolloClient>()
2828
private val mutex = Mutex()
2929

30-
suspend fun <D : Mutation.Data> mixMutateAsync(mutation: Mutation<D>, box: DBox? = UIDataCache.current().box, timeout: Int = HttpApiTimeout.DEFAULT_SECONDS): GraphqlApiResult<D> {
30+
suspend fun <D : Mutation.Data> mixMutateAsync(
31+
mutation: Mutation<D>,
32+
box: DBox? = UIDataCache.current().box,
33+
timeout: Int = HttpApiTimeout.DEFAULT_SECONDS,
34+
): GraphqlApiResult<D> {
3135
if (box == null) {
3236
return GraphqlApiResult(null, BoxUnreachableException())
3337
}
@@ -46,7 +50,11 @@ object BoxApi {
4650
return r
4751
}
4852

49-
suspend fun <D : Query.Data> mixQueryAsync(query: Query<D>, box: DBox? = UIDataCache.current().box, timeout: Int = HttpApiTimeout.DEFAULT_SECONDS): GraphqlApiResult<D> {
53+
suspend fun <D : Query.Data> mixQueryAsync(
54+
query: Query<D>,
55+
box: DBox? = UIDataCache.current().box,
56+
timeout: Int = HttpApiTimeout.DEFAULT_SECONDS,
57+
): GraphqlApiResult<D> {
5058
if (box == null) {
5159
return GraphqlApiResult(null, BoxUnreachableException())
5260
}
@@ -74,19 +82,24 @@ object BoxApi {
7482
return r
7583
}
7684

77-
private suspend fun <D : Query.Data> queryAsync(query: Query<D>, box: DBox, timeout: Int): GraphqlApiResult<D> {
85+
private suspend fun <D : Query.Data> queryAsync(
86+
query: Query<D>,
87+
box: DBox,
88+
timeout: Int,
89+
): GraphqlApiResult<D> {
7890
val boxIP = box.getBoxIP()
7991
if (boxIP.isEmpty()) {
8092
UIDataCache.current().boxNetworkReachable = false
8193
return GraphqlApiResult(null, BoxUnreachableException())
8294
}
8395

84-
val response = try {
85-
getOrCreateClient(box.id, boxIP, box.token, timeout).query(query).fetchPolicy(FetchPolicy.NetworkFirst).execute()
86-
} catch (e: ApolloException) {
87-
e.printStackTrace()
88-
return GraphqlApiResult(null, e)
89-
}
96+
val response =
97+
try {
98+
getOrCreateClient(box.id, boxIP, box.token, timeout).query(query).fetchPolicy(FetchPolicy.NetworkFirst).execute()
99+
} catch (e: ApolloException) {
100+
e.printStackTrace()
101+
return GraphqlApiResult(null, e)
102+
}
90103

91104
if (response.isFromCache) {
92105
if (UIDataCache.current().boxNetworkReachable != false) {
@@ -112,7 +125,10 @@ object BoxApi {
112125
}
113126
}
114127

115-
private suspend fun <D : Operation.Data> callBluetoothApiAsync(operation: Operation<D>, box: DBox): ApolloResponse<D>? {
128+
private suspend fun <D : Operation.Data> callBluetoothApiAsync(
129+
operation: Operation<D>,
130+
box: DBox,
131+
): ApolloResponse<D>? {
116132
if (!BluetoothUtil.ensurePermissionAsync()) {
117133
return null
118134
}
@@ -140,35 +156,46 @@ object BoxApi {
140156
return "https://$boxIP:8443/public"
141157
}
142158

143-
private suspend fun <D : Mutation.Data> mutateAsync(mutation: Mutation<D>, box: DBox, timeout: Int): GraphqlApiResult<D> {
159+
private suspend fun <D : Mutation.Data> mutateAsync(
160+
mutation: Mutation<D>,
161+
box: DBox,
162+
timeout: Int,
163+
): GraphqlApiResult<D> {
144164
val boxIP = box.getBoxIP()
145165
if (boxIP.isEmpty()) {
146166
return GraphqlApiResult(null, BoxUnreachableException())
147167
}
148-
val response = try {
149-
getOrCreateClient(box.id, boxIP, box.token, timeout).mutation(mutation).execute()
150-
} catch (e: ApolloException) {
151-
e.printStackTrace()
152-
return GraphqlApiResult(null, e)
153-
}
168+
val response =
169+
try {
170+
getOrCreateClient(box.id, boxIP, box.token, timeout).mutation(mutation).execute()
171+
} catch (e: ApolloException) {
172+
e.printStackTrace()
173+
return GraphqlApiResult(null, e)
174+
}
154175

155176
return GraphqlApiResult(response, null)
156177
}
157178

158-
private fun getOrCreateClient(boxId: String, ip: String, token: String, timeout: Int): ApolloClient {
179+
private fun getOrCreateClient(
180+
boxId: String,
181+
ip: String,
182+
token: String,
183+
timeout: Int,
184+
): ApolloClient {
159185
val key = "$boxId:$ip:$timeout"
160186
var apolloClient = clients[key]
161187
if (apolloClient != null) {
162188
return apolloClient
163189
}
164190

165-
apolloClient = ApolloClient.Builder()
166-
.serverUrl("https://$ip:8443/graphql")
167-
.okHttpClient(HttpClientManager.createCryptoHttpClient(token, timeout))
168-
.normalizedCache(SqlNormalizedCacheFactory(MainApp.instance, "apollo_${boxId}.db"))
169-
.addCustomScalarAdapter(com.ismartcoding.plain.type.Time.type, com.apollographql.apollo3.adapter.DateAdapter)
170-
.build()
191+
apolloClient =
192+
ApolloClient.Builder()
193+
.serverUrl("https://$ip:8443/graphql")
194+
.okHttpClient(HttpClientManager.createCryptoHttpClient(token, timeout))
195+
.normalizedCache(SqlNormalizedCacheFactory(MainApp.instance, "apollo_$boxId.db"))
196+
.addCustomScalarAdapter(com.ismartcoding.plain.type.Time.type, com.apollographql.apollo3.adapter.DateAdapter)
197+
.build()
171198
clients[key] = apolloClient
172199
return apolloClient
173200
}
174-
}
201+
}

‎app/src/main/java/com/ismartcoding/plain/api/BoxProxyApi.kt

+16-7
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,18 @@ import okhttp3.RequestBody.Companion.toRequestBody
99
object BoxProxyApi {
1010
private var clients = mutableMapOf<String, OkHttpClient>()
1111

12-
suspend fun executeAsync(body: String, timeout: Int): String {
12+
suspend fun executeAsync(
13+
body: String,
14+
timeout: Int,
15+
): String {
1316
val box = UIDataCache.current().box ?: return """{"errors":[{"message":"box_is_null"}]}"""
1417
val boxApi = box.getBoxIP()
1518
val client = getOrCreateClient(box.id, box.getBoxIP(), box.token, timeout)
16-
val request = Request.Builder()
17-
.url("https://$boxApi:8443/graphql")
18-
.post(body.toRequestBody("application/json".toMediaType()))
19-
.build()
19+
val request =
20+
Request.Builder()
21+
.url("https://$boxApi:8443/graphql")
22+
.post(body.toRequestBody("application/json".toMediaType()))
23+
.build()
2024

2125
try {
2226
return client.newCall(request).execute().use { response ->
@@ -30,7 +34,12 @@ object BoxProxyApi {
3034
}
3135
}
3236

33-
private fun getOrCreateClient(boxId: String, ip: String, token: String, timeout: Int): OkHttpClient {
37+
private fun getOrCreateClient(
38+
boxId: String,
39+
ip: String,
40+
token: String,
41+
timeout: Int,
42+
): OkHttpClient {
3443
val key = "$boxId:$ip:$timeout"
3544
var client = clients[key]
3645
if (client == null) {
@@ -40,4 +49,4 @@ object BoxProxyApi {
4049

4150
return client
4251
}
43-
}
52+
}

‎app/src/main/java/com/ismartcoding/plain/api/BoxUnreachableException.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package com.ismartcoding.plain.api
22

3-
class BoxUnreachableException: Exception()
3+
class BoxUnreachableException : Exception()

‎app/src/main/java/com/ismartcoding/plain/api/GraphqlApiResult.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ data class GraphqlApiResult<D : Operation.Data>(val response: ApolloResponse<D>?
2525

2626
return ""
2727
}
28-
}
28+
}

‎app/src/main/java/com/ismartcoding/plain/api/HttpApiTimeout.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ object HttpApiTimeout {
44
var DEFAULT_SECONDS: Int = 2
55
var MEDIUM_SECONDS: Int = 5
66
var BROWSER_SECONDS: Int = 15
7-
}
7+
}

0 commit comments

Comments
 (0)