Fix server and mac address

kmod-midori · Jan 3, 2025 · acc0610 · acc0610
1 parent 93e22bd
commit acc0610
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -25,6 +25,18 @@
 -keepattributes LineNumberTable,SourceFile
 -renamesourcefileattribute SourceFile
 
+-keepattributes Signature,InnerClasses
+-keepclasseswithmembers class io.netty.** {
+    *;
+}
+-keepnames class io.netty.** {
+    *;
+}
+
+-keep class moe.reimu.catshare.services.* {
+    *;
+}
+
 # Please add these rules to your existing keep rules in order to suppress warnings.
 # This is generated automatically by the Android Gradle plugin.
 -dontwarn com.aayushatharva.brotli4j.Brotli4jLoader

diff --git a/app/src/main/java/moe/reimu/catshare/services/P2pSenderService.kt b/app/src/main/java/moe/reimu/catshare/services/P2pSenderService.kt
@@ -355,13 +355,12 @@ class P2pSenderService : BaseP2pService() {
             try {
                 groupInfoFuture = CompletableDeferred()
                 p2pManager.createGroupSuspend(p2pChannel, p2pConfig)
-                val newGroupInfo = groupInfoFuture.awaitWithTimeout(
+                groupInfoFuture.awaitWithTimeout(
                     Duration.ofSeconds(5),
                     "Waiting for P2P group info"
                 )
 
-                val p2pMac =
-                    ShizukuUtils.getMacAddress(newGroupInfo.`interface`) ?: "02:00:00:00:00:00"
+                val p2pMac = ShizukuUtils.getMacAddress("p2p0") ?: "02:00:00:00:00:00"
                 Log.d(TAG, "Advertised local MAC address: $p2pMac")
 
                 withTimeoutReason(Duration.ofSeconds(10), "BLE operations") {