From 98dccef598349df0fc7f65e4e6a286d154298bf0 Mon Sep 17 00:00:00 2001
From: Johann <9853102+hajoha@users.noreply.github.com>
Date: Mon, 3 Jun 2024 15:01:18 +0200
Subject: [PATCH] Move singing parameter (#12)

* add iPerf3.17.1 support

* move keyStoreProperties to android/key.properties

* add default keystore
---
 .gitignore                                    |   3 +++
 app/build.gradle                              |  20 ++++++++++++++++--
 app/omnt_default.jks                          | Bin 0 -> 2756 bytes
 .../Iperf3/Iperf3LibLoader.java               |   3 ++-
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 app/omnt_default.jks

diff --git a/.gitignore b/.gitignore
index c05a75c7..69e1790d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,3 +97,6 @@ lint/tmp/
 
 # Android Profiling
 *.hprof
+
+android/key.propierties
+*.so
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 04f9a231..496d1c14 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,11 +11,27 @@ plugins {
     id("org.spdx.sbom") version "0.7.0"
 }
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('android/key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+} else {
+    project.logger.warn("File not found: ${keystorePropertiesFile}")
+    project.logger.warn("Using default values for signing config.")
+    keystoreProperties['keyAlias'] = "omnt_default"
+    keystoreProperties['keyPassword'] = "omnt2024"
+    keystoreProperties['storeFile'] = file("omnt_default.jks")
+    keystoreProperties['storePassword'] = "omnt2024"
+}
+
+
 android {
     signingConfigs {
         debug {
-            storeFile file('OpenMobileNetworkToolkit-key.jks')
-            keyAlias 'key0'
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword keystoreProperties['storePassword']
         }
     }
     compileSdk 34
diff --git a/app/omnt_default.jks b/app/omnt_default.jks
new file mode 100644
index 0000000000000000000000000000000000000000..5b996bc80cc9fbd3ee3af8c82c420c8da349f6c2
GIT binary patch
literal 2756
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

literal 0
HcmV?d00001

diff --git a/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Iperf3LibLoader.java b/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Iperf3LibLoader.java
index ad808dbe..c8d20e25 100644
--- a/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Iperf3LibLoader.java
+++ b/app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/Iperf3/Iperf3LibLoader.java
@@ -23,7 +23,8 @@ public class Iperf3LibLoader {
         "iperf3.11",
         "iperf3.12",
         "iperf3.15",
-        "iperf3.16"
+        "iperf3.16",
+        "iperf3.17.1"
     );
 
     protected static synchronized void load() {