From 366fa11fa2041e12b63a5de9457772aef7564da4 Mon Sep 17 00:00:00 2001 From: nbschultz97 <126931519+nbschultz97@users.noreply.github.com> Date: Thu, 11 Sep 2025 14:35:43 -0600 Subject: [PATCH 1/5] Ignore generated assets --- .gitignore | 3 +- app/src/main/AndroidManifest.xml | 14 +++++++++ .../java/com/vantagescanner/MainActivity.kt | 30 +++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/com/vantagescanner/MainActivity.kt diff --git a/.gitignore b/.gitignore index 6a809ec..6a36d18 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ # Generated binary assets -app/ +app/src/main/assets/ +app/src/main/res/drawable/ __pycache__/ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..da29a0f --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/app/src/main/java/com/vantagescanner/MainActivity.kt b/app/src/main/java/com/vantagescanner/MainActivity.kt new file mode 100644 index 0000000..4420ff0 --- /dev/null +++ b/app/src/main/java/com/vantagescanner/MainActivity.kt @@ -0,0 +1,30 @@ +package com.vantagescanner + +import android.Manifest +import android.content.pm.PackageManager +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import androidx.core.app.ActivityCompat +import androidx.core.content.ContextCompat + +class MainActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + checkPermissionsAndStart() + } + + private fun checkPermissionsAndStart() { + val required = arrayOf( + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.NEARBY_WIFI_DEVICES + ) + val missing = required.filter { + ContextCompat.checkSelfPermission(this, it) != PackageManager.PERMISSION_GRANTED + } + if (missing.isEmpty()) { + // start scanning when implementing CSI pose estimation + } else { + ActivityCompat.requestPermissions(this, missing.toTypedArray(), 0) + } + } +} From 1abe779609d5f8929d690b78a4169ed7631ed9ed Mon Sep 17 00:00:00 2001 From: nbschultz97 <126931519+nbschultz97@users.noreply.github.com> Date: Thu, 11 Sep 2025 14:38:32 -0600 Subject: [PATCH 2/5] Handle Nearby Wi-Fi permission dynamically --- app/src/main/AndroidManifest.xml | 1 + app/src/main/java/com/vantagescanner/MainActivity.kt | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index da29a0f..51c9ae6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ + diff --git a/app/src/main/java/com/vantagescanner/MainActivity.kt b/app/src/main/java/com/vantagescanner/MainActivity.kt index 4420ff0..3d70472 100644 --- a/app/src/main/java/com/vantagescanner/MainActivity.kt +++ b/app/src/main/java/com/vantagescanner/MainActivity.kt @@ -2,6 +2,7 @@ package com.vantagescanner import android.Manifest import android.content.pm.PackageManager +import android.os.Build import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.core.app.ActivityCompat @@ -14,10 +15,10 @@ class MainActivity : AppCompatActivity() { } private fun checkPermissionsAndStart() { - val required = arrayOf( - Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.NEARBY_WIFI_DEVICES - ) + val required = mutableListOf(Manifest.permission.ACCESS_FINE_LOCATION) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + required += Manifest.permission.NEARBY_WIFI_DEVICES + } val missing = required.filter { ContextCompat.checkSelfPermission(this, it) != PackageManager.PERMISSION_GRANTED } From 2ae2fb51afe308961532c5fa4e4de53662866b51 Mon Sep 17 00:00:00 2001 From: nbschultz97 <126931519+nbschultz97@users.noreply.github.com> Date: Thu, 11 Sep 2025 14:38:39 -0600 Subject: [PATCH 3/5] Handle Nearby Wi-Fi permission dynamically --- app/src/main/AndroidManifest.xml | 1 + app/src/main/java/com/vantagescanner/MainActivity.kt | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index da29a0f..51c9ae6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ + diff --git a/app/src/main/java/com/vantagescanner/MainActivity.kt b/app/src/main/java/com/vantagescanner/MainActivity.kt index 4420ff0..3d70472 100644 --- a/app/src/main/java/com/vantagescanner/MainActivity.kt +++ b/app/src/main/java/com/vantagescanner/MainActivity.kt @@ -2,6 +2,7 @@ package com.vantagescanner import android.Manifest import android.content.pm.PackageManager +import android.os.Build import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.core.app.ActivityCompat @@ -14,10 +15,10 @@ class MainActivity : AppCompatActivity() { } private fun checkPermissionsAndStart() { - val required = arrayOf( - Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.NEARBY_WIFI_DEVICES - ) + val required = mutableListOf(Manifest.permission.ACCESS_FINE_LOCATION) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + required += Manifest.permission.NEARBY_WIFI_DEVICES + } val missing = required.filter { ContextCompat.checkSelfPermission(this, it) != PackageManager.PERMISSION_GRANTED } From 12c2ebb2d4be6aaca75719540b145f4dcdc2ffbd Mon Sep 17 00:00:00 2001 From: nbschultz97 <126931519+nbschultz97@users.noreply.github.com> Date: Thu, 11 Sep 2025 14:43:26 -0600 Subject: [PATCH 4/5] Specify exported attribute for launcher activity --- app/src/main/AndroidManifest.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 51c9ae6..fd04f64 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,7 +5,9 @@ - + From 3828f8b06caec1f85964fc53962292e22285588d Mon Sep 17 00:00:00 2001 From: nbschultz97 <126931519+nbschultz97@users.noreply.github.com> Date: Thu, 11 Sep 2025 14:43:51 -0600 Subject: [PATCH 5/5] fix: add exported attribute to MainActivity --- app/src/main/AndroidManifest.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 51c9ae6..fd04f64 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,7 +5,9 @@ - +