Fix RSA Keys not stored

jamal2362 · May 22, 2024 · 3ca5f85 · 3ca5f85
1 parent 581d37e
commit 3ca5f85
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 7 deletions.
diff --git a/app/src/main/java/com/jamal2367/coreelec/MainActivity.kt b/app/src/main/java/com/jamal2367/coreelec/MainActivity.kt
@@ -20,6 +20,7 @@ import com.tananaev.adblib.AdbBase64
 import com.tananaev.adblib.AdbConnection
 import com.tananaev.adblib.AdbCrypto
 import com.tananaev.adblib.AdbStream
+import java.io.File
 import java.lang.ref.WeakReference
 import java.net.Inet4Address
 import java.net.NetworkInterface
@@ -33,6 +34,8 @@ class MainActivity : Activity() {
     private var connection: AdbConnection? = null
     private var stream: AdbStream? = null
     private var myAsyncTask: MyAsyncTask? = null
+    private val publicKeyName: String = "public.key"
+    private val privateKeyName: String = "private.key"
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -79,8 +82,6 @@ class MainActivity : Activity() {
     }
 
     private fun onKeyCE(case: Int) {
-        Toast.makeText(this, getString(R.string.allow_usb_debugging_dialog), Toast.LENGTH_SHORT).show()
-
         connection = null
         stream = null
 
@@ -91,11 +92,11 @@ class MainActivity : Activity() {
 
     fun adbCommander(ip: String?, case: Int) {
         val socket = Socket(ip, 5555)
-        val generateAdbKeyPair = AdbCrypto.generateAdbKeyPair(AndroidBase64())
+        val crypto = readCryptoConfig(filesDir) ?: writeNewCryptoConfig(filesDir)
 
         try {
             if (stream == null || connection == null) {
-                connection = AdbConnection.create(socket, generateAdbKeyPair)
+                connection = AdbConnection.create(socket, crypto)
                 connection?.connect()
             }
 
@@ -123,6 +124,38 @@ class MainActivity : Activity() {
         }
     }
 
+    private fun readCryptoConfig(dataDir: File?): AdbCrypto? {
+        val pubKey = File(dataDir, publicKeyName)
+        val privKey = File(dataDir, privateKeyName)
+
+        var crypto: AdbCrypto? = null
+        if (pubKey.exists() && privKey.exists()) {
+            crypto = try {
+                AdbCrypto.loadAdbKeyPair(AndroidBase64(), privKey, pubKey)
+            } catch (e: Exception) {
+                null
+            }
+        }
+
+        return crypto
+    }
+
+    private fun writeNewCryptoConfig(dataDir: File?): AdbCrypto? {
+        val pubKey = File(dataDir, publicKeyName)
+        val privKey = File(dataDir, privateKeyName)
+
+        var crypto: AdbCrypto?
+
+        try {
+            crypto = AdbCrypto.generateAdbKeyPair(AndroidBase64())
+            crypto.saveAdbKeyPair(privKey, pubKey)
+        } catch (e: Exception) {
+            crypto = null
+        }
+
+        return crypto
+    }
+
     private fun openDeveloperSettings() {
         val intent = Intent(Settings.ACTION_SETTINGS)
         startActivity(intent)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Neustart zu CoreELEC</string>
-    <string name="allow_usb_debugging_dialog">Das Dialogfeld für USB-Debugging bitte zulassen</string>
     <string name="enable_usb_debugging_first">Aktiviere zuerst USB-Debugging in den Entwickleroptionen</string>
     <string name="first_reboot_to_coreelec">Erster Neustart</string>
     <string name="first_reboot_to_coreelec_info">"'"&lt;b>Erster Neustart&lt;/b>"'" muss beim ersten Start von CoreELEC oder nach einem Update des Android-Systems ausgeführt werden.</string>

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Újraindítás CoreELEC-el</string>
-    <string name="allow_usb_debugging_dialog">Kérjük, engedélyezze a párbeszédpanelt az USB-hibakereséshez</string>
     <string name="enable_usb_debugging_first">Először engedélyezze az USB hibakeresést a fejlesztői beállításoknál</string>
     <string name="first_reboot_to_coreelec">Első újraindítás</string>
     <string name="first_reboot_to_coreelec_info">"'"&lt;b>Első újraindítás&lt;/b>"'" a CoreELEC első indításakor vagy az Android rendszer frissítése után kell végrehajtani.</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Reboot to CoreELEC</string>
-    <string name="allow_usb_debugging_dialog">Please allow the dialog box for USB debugging</string>
     <string name="enable_usb_debugging_first">Enable USB debugging first in the developer options</string>
     <string name="first_reboot_to_coreelec">First reboot</string>
     <string name="first_reboot_to_coreelec_info">"'"&lt;b>First reboot&lt;/b>"'" must be executed when CoreELEC is started for the first time or after an update of the Android system.</string>