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 00000000..5b996bc8 Binary files /dev/null and b/app/omnt_default.jks differ 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() {