From 0b67454acf908490cc320dbc012ccda563ad490b Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Sun, 22 Aug 2021 20:49:41 -0700
Subject: [PATCH] java: Organize classes into packages

---
 java_module/app/proguard-rules.pro                            | 2 +-
 .../src/main/java/dev/kdrag0n/safetynetriru/SecurityBridge.kt | 2 ++
 .../dev/kdrag0n/safetynetriru/{ => proxy}/ProxyKeyStoreSpi.kt | 3 ++-
 .../dev/kdrag0n/safetynetriru/{ => proxy}/ProxyProvider.kt    | 4 +++-
 .../main/java/dev/kdrag0n/safetynetriru/{ => util}/Utils.kt   | 0
 5 files changed, 8 insertions(+), 3 deletions(-)
 rename java_module/app/src/main/java/dev/kdrag0n/safetynetriru/{ => proxy}/ProxyKeyStoreSpi.kt (97%)
 rename java_module/app/src/main/java/dev/kdrag0n/safetynetriru/{ => proxy}/ProxyProvider.kt (87%)
 rename java_module/app/src/main/java/dev/kdrag0n/safetynetriru/{ => util}/Utils.kt (100%)

diff --git a/java_module/app/proguard-rules.pro b/java_module/app/proguard-rules.pro
index 4667fda..4fd7834 100644
--- a/java_module/app/proguard-rules.pro
+++ b/java_module/app/proguard-rules.pro
@@ -24,6 +24,6 @@
     public static void init();
 }
 
--keepclassmembers class dev.kdrag0n.safetynetriru.ProxyKeyStoreSpi {
+-keepclassmembers class dev.kdrag0n.safetynetriru.proxy.ProxyKeyStoreSpi {
     public <init>(...);
 }
diff --git a/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/SecurityBridge.kt b/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/SecurityBridge.kt
index b90f273..4a075b4 100644
--- a/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/SecurityBridge.kt
+++ b/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/SecurityBridge.kt
@@ -1,5 +1,7 @@
 package dev.kdrag0n.safetynetriru
 
+import dev.kdrag0n.safetynetriru.proxy.ProxyKeyStoreSpi
+import dev.kdrag0n.safetynetriru.proxy.ProxyProvider
 import java.security.KeyStore
 import java.security.KeyStoreSpi
 import java.security.Security
diff --git a/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/ProxyKeyStoreSpi.kt b/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/proxy/ProxyKeyStoreSpi.kt
similarity index 97%
rename from java_module/app/src/main/java/dev/kdrag0n/safetynetriru/ProxyKeyStoreSpi.kt
rename to java_module/app/src/main/java/dev/kdrag0n/safetynetriru/proxy/ProxyKeyStoreSpi.kt
index 79e393e..1c27fee 100644
--- a/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/ProxyKeyStoreSpi.kt
+++ b/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/proxy/ProxyKeyStoreSpi.kt
@@ -1,5 +1,6 @@
-package dev.kdrag0n.safetynetriru
+package dev.kdrag0n.safetynetriru.proxy
 
+import dev.kdrag0n.safetynetriru.logDebug
 import java.io.InputStream
 import java.io.OutputStream
 import java.security.Key
diff --git a/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/ProxyProvider.kt b/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/proxy/ProxyProvider.kt
similarity index 87%
rename from java_module/app/src/main/java/dev/kdrag0n/safetynetriru/ProxyProvider.kt
rename to java_module/app/src/main/java/dev/kdrag0n/safetynetriru/proxy/ProxyProvider.kt
index 3644e0b..2f1288f 100644
--- a/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/ProxyProvider.kt
+++ b/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/proxy/ProxyProvider.kt
@@ -1,5 +1,7 @@
-package dev.kdrag0n.safetynetriru
+package dev.kdrag0n.safetynetriru.proxy
 
+import dev.kdrag0n.safetynetriru.SecurityBridge
+import dev.kdrag0n.safetynetriru.logDebug
 import java.security.Provider
 
 // This is mostly just a pass-through provider that exists to change the provider's ClassLoader.
diff --git a/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/Utils.kt b/java_module/app/src/main/java/dev/kdrag0n/safetynetriru/util/Utils.kt
similarity index 100%
rename from java_module/app/src/main/java/dev/kdrag0n/safetynetriru/Utils.kt
rename to java_module/app/src/main/java/dev/kdrag0n/safetynetriru/util/Utils.kt