Android Code clean up

.github/workflows/deploy_jar.yml

@@ -76,5 +76,5 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ needs.create_release.outputs.v-version }}
-          files: build/libs/fingerprint_localization*.jar
+          files: REUServer/build/libs/fingerprint_localization*.jar
           token: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -1,5 +1,6 @@
 # Security of Smart Things REU 2017  
-[![Build Status](https://travis-ci.com/AndrewQuijano/SSTREU2017.svg?branch=master)](https://travis-ci.com/AndrewQuijano/SSTREU2017)  
+[![Test Android and Fingerprint Server](https://github.com/adwise-fiu/Secure_Indoor_Localization/actions/workflows/parallel_tests.yml/badge.svg?branch=main)](https://github.com/adwise-fiu/Secure_Indoor_Localization/actions/workflows/parallel_tests.yml)
+
 [![codecov](https://codecov.io/gh/AndrewQuijano/SSTREU2017/branch/master/graph/badge.svg?token=E7ZKFWTE3D)](https://codecov.io/gh/AndrewQuijano/SSTREU2017)  
 This repository contains all the code used to complete the Security of Smart Things REU project of privacy preserving indoor localization.
 

REU2017/app/build.gradle

@@ -1,15 +1,26 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 35
+    compileSdkVersion 36
     defaultConfig {
         applicationId "edu.fiu.reu2017"
-        minSdkVersion 25
-        targetSdkVersion 35
+        minSdkVersion 26
+        targetSdkVersion 36
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+
+    packagingOptions {
+        resources {
+            excludes += '**/log4j2.xml'       // Excludes any file named log4j2.xml in any directory
+            excludes += '**/log4j.properties' // Example: Also exclude log4j.properties if present
+            excludes += '**/log4j2.component.properties' // Example: Another common Log4j file
+            // Add the new exclusion for META-INF/DEPENDENCIES
+            excludes += 'META-INF/DEPENDENCIES'
+            // Add more patterns if you identify other Log4j specific files causing issues
+        }
+    }
     buildTypes
             {
                 release
@@ -19,10 +30,10 @@ android {
                         }
             }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
-    namespace 'edu.fiu.reu2017'
+    namespace = 'edu.fiu.reu2017'
 }
 
 dependencies
@@ -37,6 +48,8 @@ dependencies
             testImplementation 'junit:junit:4.13.2'
             // https://mvnrepository.com/artifact/io.github.andrewquijano/ciphercraft
             implementation 'io.github.andrewquijano:ciphercraft:1.0.6'
+            // https://mvnrepository.com/artifact/io.github.andrewquijano/fingerprint_localization
+            implementation 'io.github.andrewquijano:fingerprint_localization:1.0.0'
         }
 java {
     toolchain {

REU2017/app/src/main/java/Localization/ClientThread.java

@@ -10,16 +10,17 @@
 import java.security.KeyPair;
 import java.util.ArrayList;
 
-import Localization.structs.SendLocalizationData;
-import Localization.structs.LocalizationResult;
-import Localization.structs.SendTrainingData;
+import edu.fiu.adwise.fingerprint_localization.structs.SendLocalizationData;
+import edu.fiu.adwise.fingerprint_localization.structs.LocalizationResult;
+import edu.fiu.adwise.fingerprint_localization.structs.SendTrainingData;
 import edu.fiu.adwise.homomorphic_encryption.misc.HomomorphicException;
 import ui.MainActivity;
 import ui.TrainActivity;
 
 
 import static ui.MainActivity.SQLDatabase;
 import static ui.MainActivity.portNumber;
+import edu.fiu.adwise.fingerprint_localization.distance_computation.LOCALIZATION_SCHEME;
 
 import edu.fiu.adwise.homomorphic_encryption.dgk.DGKOperations;
 import edu.fiu.adwise.homomorphic_encryption.dgk.DGKPrivateKey;
@@ -188,9 +189,6 @@ public void run () {
                 case DGK_MIN:
                 case DGK_MCA:
                 case DGK_DMA:
-                case EL_GAMAL_DMA:
-                case EL_GAMAL_MIN:
-                case EL_GAMAL_MCA:
                     localize();
                     break;
                 default:

REU2017/app/src/main/java/Localization/background.java

@@ -21,8 +21,9 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import Localization.structs.SendLocalizationData;
-import Localization.structs.LocalizationResult;
+import edu.fiu.adwise.fingerprint_localization.distance_computation.LOCALIZATION_SCHEME;
+import edu.fiu.adwise.fingerprint_localization.structs.SendLocalizationData;
+import edu.fiu.adwise.fingerprint_localization.structs.LocalizationResult;
 import edu.fiu.adwise.homomorphic_encryption.misc.HomomorphicException;
 import ui.MainActivity;
 
@@ -34,7 +35,7 @@
 import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierPublicKey;
 
 import static android.graphics.Color.RED;
-import static Localization.LOCALIZATION_SCHEME.*;
+import static edu.fiu.adwise.fingerprint_localization.distance_computation.LOCALIZATION_SCHEME.*;
 import static ui.LocalizeActivity.off_map;
 
 public final class background {
@@ -366,12 +367,12 @@ private Float[] doInBackground() {
         float y = 0;
 
         for (int i = 0; i < MainActivity.k; i++) {
-            distanceSUM += fromServer.get(i).plainDistance;
+            distanceSUM += fromServer.get(i).getPlainDistance();
         }
 
         // Find value of all w_i
         for (int i = 0 ; i < MainActivity.k; i++) {
-            w_i[i] = ((double) fromServer.get(i).plainDistance/distanceSUM);
+            w_i[i] = ((double) fromServer.get(i).getPlainDistance()/distanceSUM);
             w_i[i] = 1.0 - w_i[i];
             w_i[i] = w_i[i]/(MainActivity.k - 1);
             x += (float) (w_i[i] * fromServer.get(i).getX());