diff --git a/app/src/main/java/com/github/kr328/clash/LogcatService.kt b/app/src/main/java/com/github/kr328/clash/LogcatService.kt index f2bf94c..c0abbc7 100644 --- a/app/src/main/java/com/github/kr328/clash/LogcatService.kt +++ b/app/src/main/java/com/github/kr328/clash/LogcatService.kt @@ -23,8 +23,8 @@ import com.github.kr328.clash.model.LogFile import com.github.kr328.clash.preference.UiSettings import com.github.kr328.clash.service.ClashManagerService import com.github.kr328.clash.service.IClashManager -import com.github.kr328.clash.service.ipc.IStreamCallback -import com.github.kr328.clash.service.ipc.ParcelableContainer +import com.github.kr328.clash.service.transact.IStreamCallback +import com.github.kr328.clash.service.transact.ParcelableContainer import com.github.kr328.clash.utils.format import com.github.kr328.clash.utils.logsDir import kotlinx.coroutines.* diff --git a/app/src/main/java/com/github/kr328/clash/remote/ClashClient.kt b/app/src/main/java/com/github/kr328/clash/remote/ClashClient.kt index eabb1a0..5588420 100644 --- a/app/src/main/java/com/github/kr328/clash/remote/ClashClient.kt +++ b/app/src/main/java/com/github/kr328/clash/remote/ClashClient.kt @@ -4,8 +4,8 @@ import android.os.RemoteException import com.github.kr328.clash.core.model.General import com.github.kr328.clash.core.model.ProxyGroup import com.github.kr328.clash.service.IClashManager -import com.github.kr328.clash.service.ipc.IStreamCallback -import com.github.kr328.clash.service.ipc.ParcelableContainer +import com.github.kr328.clash.service.transact.IStreamCallback +import com.github.kr328.clash.service.transact.ParcelableContainer import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/java/com/github/kr328/clash/remote/ProfileClient.kt b/app/src/main/java/com/github/kr328/clash/remote/ProfileClient.kt index cb10af6..3a112e3 100644 --- a/app/src/main/java/com/github/kr328/clash/remote/ProfileClient.kt +++ b/app/src/main/java/com/github/kr328/clash/remote/ProfileClient.kt @@ -2,8 +2,8 @@ package com.github.kr328.clash.remote import android.os.RemoteException import com.github.kr328.clash.service.IProfileService -import com.github.kr328.clash.service.ipc.IStreamCallback -import com.github.kr328.clash.service.ipc.ParcelableContainer +import com.github.kr328.clash.service.transact.IStreamCallback +import com.github.kr328.clash.service.transact.ParcelableContainer import com.github.kr328.clash.service.model.ProfileMetadata import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Dispatchers diff --git a/service/src/main/aidl/com/github/kr328/clash/service/IClashManager.aidl b/service/src/main/aidl/com/github/kr328/clash/service/IClashManager.aidl index 4c4186e..c8c7913 100644 --- a/service/src/main/aidl/com/github/kr328/clash/service/IClashManager.aidl +++ b/service/src/main/aidl/com/github/kr328/clash/service/IClashManager.aidl @@ -1,6 +1,6 @@ package com.github.kr328.clash.service; -import com.github.kr328.clash.service.ipc.IStreamCallback; +import com.github.kr328.clash.service.transact.IStreamCallback; import com.github.kr328.clash.core.model.Packet; interface IClashManager { diff --git a/service/src/main/aidl/com/github/kr328/clash/service/IProfileService.aidl b/service/src/main/aidl/com/github/kr328/clash/service/IProfileService.aidl index b21a58c..43d17f5 100644 --- a/service/src/main/aidl/com/github/kr328/clash/service/IProfileService.aidl +++ b/service/src/main/aidl/com/github/kr328/clash/service/IProfileService.aidl @@ -1,7 +1,6 @@ package com.github.kr328.clash.service; -import com.github.kr328.clash.service.ipc.IStreamCallback; -import com.github.kr328.clash.service.transact.ProfileRequest; +import com.github.kr328.clash.service.transact.IStreamCallback; import com.github.kr328.clash.service.model.ProfileMetadata; interface IProfileService { diff --git a/service/src/main/aidl/com/github/kr328/clash/service/ipc/ParcelableContainer.aidl b/service/src/main/aidl/com/github/kr328/clash/service/ipc/ParcelableContainer.aidl deleted file mode 100644 index 9bdfa83..0000000 --- a/service/src/main/aidl/com/github/kr328/clash/service/ipc/ParcelableContainer.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.kr328.clash.service.ipc; - -parcelable ParcelableContainer; \ No newline at end of file diff --git a/service/src/main/aidl/com/github/kr328/clash/service/ipc/IStreamCallback.aidl b/service/src/main/aidl/com/github/kr328/clash/service/transact/IStreamCallback.aidl similarity index 55% rename from service/src/main/aidl/com/github/kr328/clash/service/ipc/IStreamCallback.aidl rename to service/src/main/aidl/com/github/kr328/clash/service/transact/IStreamCallback.aidl index 2114f79..80d8e44 100644 --- a/service/src/main/aidl/com/github/kr328/clash/service/ipc/IStreamCallback.aidl +++ b/service/src/main/aidl/com/github/kr328/clash/service/transact/IStreamCallback.aidl @@ -1,6 +1,6 @@ -package com.github.kr328.clash.service.ipc; +package com.github.kr328.clash.service.transact; -import com.github.kr328.clash.service.ipc.ParcelableContainer; +import com.github.kr328.clash.service.transact.ParcelableContainer; interface IStreamCallback { void send(in ParcelableContainer data); diff --git a/service/src/main/aidl/com/github/kr328/clash/service/transact/ProfileRequest.aidl b/service/src/main/aidl/com/github/kr328/clash/service/transact/ParcelableContainer.aidl similarity index 61% rename from service/src/main/aidl/com/github/kr328/clash/service/transact/ProfileRequest.aidl rename to service/src/main/aidl/com/github/kr328/clash/service/transact/ParcelableContainer.aidl index 2d51862..5323a66 100644 --- a/service/src/main/aidl/com/github/kr328/clash/service/transact/ProfileRequest.aidl +++ b/service/src/main/aidl/com/github/kr328/clash/service/transact/ParcelableContainer.aidl @@ -1,3 +1,3 @@ package com.github.kr328.clash.service.transact; -parcelable ProfileRequest; \ No newline at end of file +parcelable ParcelableContainer; \ No newline at end of file diff --git a/service/src/main/java/com/github/kr328/clash/service/ClashManager.kt b/service/src/main/java/com/github/kr328/clash/service/ClashManager.kt index 0d99765..361a0ac 100644 --- a/service/src/main/java/com/github/kr328/clash/service/ClashManager.kt +++ b/service/src/main/java/com/github/kr328/clash/service/ClashManager.kt @@ -7,8 +7,8 @@ import com.github.kr328.clash.core.model.ProxyGroupList import com.github.kr328.clash.service.data.ProfileDao import com.github.kr328.clash.service.data.SelectedProxyDao import com.github.kr328.clash.service.data.SelectedProxyEntity -import com.github.kr328.clash.service.ipc.IStreamCallback -import com.github.kr328.clash.service.ipc.ParcelableContainer +import com.github.kr328.clash.service.transact.IStreamCallback +import com.github.kr328.clash.service.transact.ParcelableContainer import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/service/src/main/java/com/github/kr328/clash/service/ProfileBackgroundService.kt b/service/src/main/java/com/github/kr328/clash/service/ProfileBackgroundService.kt index 648b064..0cf699b 100644 --- a/service/src/main/java/com/github/kr328/clash/service/ProfileBackgroundService.kt +++ b/service/src/main/java/com/github/kr328/clash/service/ProfileBackgroundService.kt @@ -17,8 +17,8 @@ import com.github.kr328.clash.common.ids.NotificationChannels import com.github.kr328.clash.common.ids.NotificationIds import com.github.kr328.clash.common.util.intent import com.github.kr328.clash.service.data.ProfileDao -import com.github.kr328.clash.service.ipc.IStreamCallback -import com.github.kr328.clash.service.ipc.ParcelableContainer +import com.github.kr328.clash.service.transact.IStreamCallback +import com.github.kr328.clash.service.transact.ParcelableContainer import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/service/src/main/java/com/github/kr328/clash/service/ProfileService.kt b/service/src/main/java/com/github/kr328/clash/service/ProfileService.kt index 303be6d..26b57e6 100644 --- a/service/src/main/java/com/github/kr328/clash/service/ProfileService.kt +++ b/service/src/main/java/com/github/kr328/clash/service/ProfileService.kt @@ -5,7 +5,7 @@ import android.net.Uri import android.os.IBinder import android.os.RemoteException import com.github.kr328.clash.service.data.ProfileDao -import com.github.kr328.clash.service.ipc.IStreamCallback +import com.github.kr328.clash.service.transact.IStreamCallback import com.github.kr328.clash.service.model.ProfileMetadata import com.github.kr328.clash.service.model.toProfileMetadata import com.github.kr328.clash.service.util.broadcastProfileChanged diff --git a/service/src/main/java/com/github/kr328/clash/service/ipc/ParcelableContainer.kt b/service/src/main/java/com/github/kr328/clash/service/transact/ParcelableContainer.kt similarity index 94% rename from service/src/main/java/com/github/kr328/clash/service/ipc/ParcelableContainer.kt rename to service/src/main/java/com/github/kr328/clash/service/transact/ParcelableContainer.kt index 579546f..712575a 100644 --- a/service/src/main/java/com/github/kr328/clash/service/ipc/ParcelableContainer.kt +++ b/service/src/main/java/com/github/kr328/clash/service/transact/ParcelableContainer.kt @@ -1,4 +1,4 @@ -package com.github.kr328.clash.service.ipc +package com.github.kr328.clash.service.transact import android.os.Parcel import android.os.Parcelable