From a810d38aaffc740ad8534bf673eb90ceb5cccad6 Mon Sep 17 00:00:00 2001 From: kalynstricklin Date: Fri, 21 Aug 2026 10:12:01 -0500 Subject: [PATCH 1/7] upgrade gradle and target sdk, comment out apk relelease workflow --- .github/workflows/gradle_build.yml | 22 +++++++++++----------- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index d31daa91..c7e398dc 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -33,15 +33,15 @@ jobs: chmod +x ./gradlew ./gradlew build -x test -x osgi -x lintDebug -x javadoc - - name: Upload APK artifact - uses: actions/upload-artifact@v4 - with: - name: osh-android-APK - path: sensorhub-android-app/build/outputs/apk/debug/sensorhub-android-app-debug.apk +# - name: Upload APK artifact +# uses: actions/upload-artifact@v4 +# with: +# name: osh-android-APK +# path: sensorhub-android-app/build/outputs/apk/debug/sensorhub-android-app-debug.apk - - name: Create GitHub Release - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') - uses: softprops/action-gh-release@v2 - with: - files: sensorhub-android-app/build/outputs/apk/debug/*.apk - generate_release_notes: true \ No newline at end of file +# - name: Create GitHub Release +# if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') +# uses: softprops/action-gh-release@v2 +# with: +# files: sensorhub-android-app/build/outputs/apk/debug/*.apk +# generate_release_notes: true \ No newline at end of file diff --git a/build.gradle b/build.gradle index fdaf4447..cfd18ea6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ ext.oshCoreVersion = '2.0.0-beta' ext.compileSdkVersion = 34 ext.minSdkVersion = 33 -ext.targetSdkVersion = 30 +ext.targetSdkVersion = 34 ext.buildToolsVersion = "34.0.0" version = '4.1.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c684..15de9024 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From f1b61a532d2d61ec4ea050638823972eac0ad8b3 Mon Sep 17 00:00:00 2001 From: kalynstricklin Date: Fri, 21 Aug 2026 10:17:05 -0500 Subject: [PATCH 2/7] removed legacy support lib refs --- .../src/org/sensorhub/android/AppPreferencesFragment.java | 2 +- .../src/org/sensorhub/android/DashboardFragment.java | 2 +- .../src/org/sensorhub/android/MainActivity.java | 2 +- sensorhub-android-blebeacon/build.gradle | 7 ++++--- .../impl/sensor/blebeacon/ExampleInstrumentedTest.java | 4 ++-- sensorhub-android-meshtastic/build.gradle | 2 +- sensorhub-android-ste/build.gradle | 2 +- sensorhub-android-template/build.gradle | 3 ++- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/sensorhub-android-app/src/org/sensorhub/android/AppPreferencesFragment.java b/sensorhub-android-app/src/org/sensorhub/android/AppPreferencesFragment.java index 6c0e483c..e438f686 100644 --- a/sensorhub-android-app/src/org/sensorhub/android/AppPreferencesFragment.java +++ b/sensorhub-android-app/src/org/sensorhub/android/AppPreferencesFragment.java @@ -10,7 +10,7 @@ import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.LocaleList; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; diff --git a/sensorhub-android-app/src/org/sensorhub/android/DashboardFragment.java b/sensorhub-android-app/src/org/sensorhub/android/DashboardFragment.java index 86350ec9..5f757269 100644 --- a/sensorhub-android-app/src/org/sensorhub/android/DashboardFragment.java +++ b/sensorhub-android-app/src/org/sensorhub/android/DashboardFragment.java @@ -6,7 +6,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import android.text.Html; import android.view.LayoutInflater; import android.view.TextureView; diff --git a/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java b/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java index 1d6c2caf..8c0cc8a2 100644 --- a/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java +++ b/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java @@ -28,7 +28,7 @@ import android.os.Bundle; import android.os.IBinder; import android.os.PowerManager; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import android.provider.Settings.Secure; import android.util.Log; import android.view.KeyEvent; diff --git a/sensorhub-android-blebeacon/build.gradle b/sensorhub-android-blebeacon/build.gradle index e8002a7e..348c0546 100644 --- a/sensorhub-android-blebeacon/build.gradle +++ b/sensorhub-android-blebeacon/build.gradle @@ -36,10 +36,11 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.6.1' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test:runner:1.5.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' implementation project(path: ':sensorhub-core') // implementation 'org.altbeacon:android-beacon-library:2.16.2' // implementation 'org.altbeacon:android-beacon-library:2.13.1' diff --git a/sensorhub-android-blebeacon/src/androidTest/java/org/sensorhub/impl/sensor/blebeacon/ExampleInstrumentedTest.java b/sensorhub-android-blebeacon/src/androidTest/java/org/sensorhub/impl/sensor/blebeacon/ExampleInstrumentedTest.java index 50c2ab2d..b13f16a9 100644 --- a/sensorhub-android-blebeacon/src/androidTest/java/org/sensorhub/impl/sensor/blebeacon/ExampleInstrumentedTest.java +++ b/sensorhub-android-blebeacon/src/androidTest/java/org/sensorhub/impl/sensor/blebeacon/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package org.sensorhub.impl.sensor.blebeacon; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/sensorhub-android-meshtastic/build.gradle b/sensorhub-android-meshtastic/build.gradle index a2b9cbf0..b1167997 100644 --- a/sensorhub-android-meshtastic/build.gradle +++ b/sensorhub-android-meshtastic/build.gradle @@ -11,7 +11,7 @@ dependencies { api project(':sensorhub-core') implementation ('org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5') implementation("com.google.protobuf:protobuf-java:4.33.0") - implementation "com.android.support:appcompat-v7:28.0.0" + implementation "androidx.appcompat:appcompat:1.6.1" implementation project(':sensorhub-android-service') implementation project(':sensorhub-driver-android') } diff --git a/sensorhub-android-ste/build.gradle b/sensorhub-android-ste/build.gradle index 7d649d06..f64388fd 100644 --- a/sensorhub-android-ste/build.gradle +++ b/sensorhub-android-ste/build.gradle @@ -5,7 +5,7 @@ ext.details = 'Driver for STE Radiation Pager' dependencies { api project(':sensorhub-core') - implementation "com.android.support:appcompat-v7:28.0.0" + implementation "androidx.appcompat:appcompat:1.6.1" implementation project(':sensorhub-android-service') implementation project(':sensorhub-driver-android') diff --git a/sensorhub-android-template/build.gradle b/sensorhub-android-template/build.gradle index be7d7faa..26c9ad56 100644 --- a/sensorhub-android-template/build.gradle +++ b/sensorhub-android-template/build.gradle @@ -12,9 +12,10 @@ dependencies { implementation 'io.reactivex.rxjava3:rxjava:3.1.6' implementation 'io.reactivex.rxjava3:rxandroid:3.0.2' implementation 'androidx.appcompat:appcompat:1.6.1' - implementation project(path: ':sensorhub-driver-android') implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.core:core:1.5.0' + + implementation project(path: ':sensorhub-driver-android') } configurations.configureEach { exclude group: "ch.qos.logback" From 7f4330cf8d999e4132b98181ffb65f31a33e3470 Mon Sep 17 00:00:00 2001 From: kalynstricklin Date: Fri, 21 Aug 2026 10:19:05 -0500 Subject: [PATCH 3/7] using string resource for csapi endpoint. removing unused dependencies from sensorhub-driver-lib --- .../res/layout/activity_edit_server_profile.xml | 2 +- sensorhub-android-app/res/values/strings.xml | 1 + sensorhub-android-lib/build.gradle | 9 --------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/sensorhub-android-app/res/layout/activity_edit_server_profile.xml b/sensorhub-android-app/res/layout/activity_edit_server_profile.xml index ed15049d..01d57735 100644 --- a/sensorhub-android-app/res/layout/activity_edit_server_profile.xml +++ b/sensorhub-android-app/res/layout/activity_edit_server_profile.xml @@ -181,7 +181,7 @@ android:layout_height="wrap_content" android:inputType="text" android:singleLine="true" - android:text="/sensorhub/api"/> + android:text="@string/default_endpoint_path"/> Host / IP Port Endpoint path + /sensorhub/api Enable TLS Disable SSL Validation AUTHENTICATION diff --git a/sensorhub-android-lib/build.gradle b/sensorhub-android-lib/build.gradle index 64f9aa0d..61ac8baf 100644 --- a/sensorhub-android-lib/build.gradle +++ b/sensorhub-android-lib/build.gradle @@ -9,12 +9,6 @@ dependencies { api project(':sensorhub-driver-angelsensor') api project(':sensorhub-driver-android') api project(':sensorhub-driver-kestrel') -// api project(':sensorhub-android-garmin') -// api project(':sensorhub-driver-flirone') -// api project(':sensorhub-client-consys-okhttp') -// api project(':sensorhub-android-flirone') - //api project(':sensorhub-android-dji') -// api project(':sensorhub-storage-h2') implementation 'org.slf4j:slf4j-android:1.6.1-RC1' implementation('javax.xml.stream:stax-api:1.0-2') @@ -22,10 +16,7 @@ dependencies { configurations { api { - // exclude stuff from APK -// exclude group: "javax.servlet" exclude group: "xml-apis" -// exclude group: "org.eclipse.jetty" exclude group: "org.n52.amused" exclude group: "ch.qos.logback" exclude group: "org.apache.felix" From 82dbbc1c27c8d5fc5c9eacf8121e21b8d700e44e Mon Sep 17 00:00:00 2001 From: kalynstricklin Date: Fri, 21 Aug 2026 10:32:53 -0500 Subject: [PATCH 4/7] upgraded kotlin version --- sensorhub-android-app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sensorhub-android-app/build.gradle b/sensorhub-android-app/build.gradle index c1b78ac4..5d83a613 100644 --- a/sensorhub-android-app/build.gradle +++ b/sensorhub-android-app/build.gradle @@ -44,9 +44,9 @@ allprojects { exclude group: 'ch.qos.logback', module: 'logback-core' resolutionStrategy { - force "org.jetbrains.kotlin:kotlin-stdlib:1.8.10" - force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10" - force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10" + force "org.jetbrains.kotlin:kotlin-stdlib:1.9.20" + force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20" + force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20" } } } From 92b66a5ef573c5f572a9d91d3e977393df68ba80 Mon Sep 17 00:00:00 2001 From: kalynstricklin Date: Fri, 21 Aug 2026 11:11:00 -0500 Subject: [PATCH 5/7] updated AGP to 8.2.2 --- build.gradle | 2 +- sensorhub-android-app/AndroidManifest.xml | 5 ++--- .../src/org/sensorhub/android/DashboardFragment.java | 2 +- sensorhub-android-blebeacon/src/main/AndroidManifest.xml | 3 +-- sensorhub-android-controller/AndroidManifest.xml | 1 - sensorhub-android-flirone/AndroidManifest.xml | 5 +---- sensorhub-android-lib/AndroidManifest.xml | 5 +---- sensorhub-android-meshtastic/src/main/AndroidManifest.xml | 5 +---- sensorhub-android-polar/AndroidManifest.xml | 3 +-- sensorhub-android-service/AndroidManifest.xml | 5 +---- sensorhub-android-ste/src/main/AndroidManifest.xml | 5 +---- sensorhub-android-wardriving/AndroidManifest.xml | 3 +-- sensorhub-driver-android/AndroidManifest.xml | 5 +---- 13 files changed, 13 insertions(+), 36 deletions(-) diff --git a/build.gradle b/build.gradle index cfd18ea6..5a789380 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.2.2' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20' } } diff --git a/sensorhub-android-app/AndroidManifest.xml b/sensorhub-android-app/AndroidManifest.xml index c19d1841..8e6d9fb0 100644 --- a/sensorhub-android-app/AndroidManifest.xml +++ b/sensorhub-android-app/AndroidManifest.xml @@ -1,14 +1,13 @@ - - + + diff --git a/sensorhub-android-app/src/org/sensorhub/android/DashboardFragment.java b/sensorhub-android-app/src/org/sensorhub/android/DashboardFragment.java index 5f757269..7442a6b7 100644 --- a/sensorhub-android-app/src/org/sensorhub/android/DashboardFragment.java +++ b/sensorhub-android-app/src/org/sensorhub/android/DashboardFragment.java @@ -386,7 +386,7 @@ protected void startRefreshingStatus() { displayCallback = new Runnable() { public void run() { displayStatus(); - videoInfoArea.setText(Html.fromHtml(videoInfoText.toString())); + videoInfoArea.setText(Html.fromHtml(videoInfoText.toString(), Html.FROM_HTML_MODE_LEGACY)); displayHandler.postDelayed(this, 1000); } }; diff --git a/sensorhub-android-blebeacon/src/main/AndroidManifest.xml b/sensorhub-android-blebeacon/src/main/AndroidManifest.xml index f6a6a09d..a2f47b60 100644 --- a/sensorhub-android-blebeacon/src/main/AndroidManifest.xml +++ b/sensorhub-android-blebeacon/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + diff --git a/sensorhub-android-controller/AndroidManifest.xml b/sensorhub-android-controller/AndroidManifest.xml index 26edfd10..d55efa33 100644 --- a/sensorhub-android-controller/AndroidManifest.xml +++ b/sensorhub-android-controller/AndroidManifest.xml @@ -1,6 +1,5 @@ diff --git a/sensorhub-android-flirone/AndroidManifest.xml b/sensorhub-android-flirone/AndroidManifest.xml index 2f9f4968..a2f47b60 100644 --- a/sensorhub-android-flirone/AndroidManifest.xml +++ b/sensorhub-android-flirone/AndroidManifest.xml @@ -1,5 +1,2 @@ - + diff --git a/sensorhub-android-lib/AndroidManifest.xml b/sensorhub-android-lib/AndroidManifest.xml index 97065f54..8352ef2c 100644 --- a/sensorhub-android-lib/AndroidManifest.xml +++ b/sensorhub-android-lib/AndroidManifest.xml @@ -1,7 +1,4 @@ - + diff --git a/sensorhub-android-meshtastic/src/main/AndroidManifest.xml b/sensorhub-android-meshtastic/src/main/AndroidManifest.xml index 5bad25b2..b2442030 100644 --- a/sensorhub-android-meshtastic/src/main/AndroidManifest.xml +++ b/sensorhub-android-meshtastic/src/main/AndroidManifest.xml @@ -1,7 +1,4 @@ - - - + diff --git a/sensorhub-android-polar/AndroidManifest.xml b/sensorhub-android-polar/AndroidManifest.xml index 7c8aba0c..bc41117b 100644 --- a/sensorhub-android-polar/AndroidManifest.xml +++ b/sensorhub-android-polar/AndroidManifest.xml @@ -1,6 +1,5 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/sensorhub-android-service/AndroidManifest.xml b/sensorhub-android-service/AndroidManifest.xml index 207c451c..e6e7ee40 100644 --- a/sensorhub-android-service/AndroidManifest.xml +++ b/sensorhub-android-service/AndroidManifest.xml @@ -1,7 +1,4 @@ - + diff --git a/sensorhub-android-ste/src/main/AndroidManifest.xml b/sensorhub-android-ste/src/main/AndroidManifest.xml index b97ad3b0..b2442030 100644 --- a/sensorhub-android-ste/src/main/AndroidManifest.xml +++ b/sensorhub-android-ste/src/main/AndroidManifest.xml @@ -1,7 +1,4 @@ - - - + diff --git a/sensorhub-android-wardriving/AndroidManifest.xml b/sensorhub-android-wardriving/AndroidManifest.xml index d2a3abe1..6f6edbca 100644 --- a/sensorhub-android-wardriving/AndroidManifest.xml +++ b/sensorhub-android-wardriving/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/sensorhub-driver-android/AndroidManifest.xml b/sensorhub-driver-android/AndroidManifest.xml index e9a28838..aea94ec0 100644 --- a/sensorhub-driver-android/AndroidManifest.xml +++ b/sensorhub-driver-android/AndroidManifest.xml @@ -1,7 +1,4 @@ - + From 794cf17b5276eb6ae0adf8831b56c481bdbd8886 Mon Sep 17 00:00:00 2001 From: kalynstricklin Date: Fri, 21 Aug 2026 11:17:11 -0500 Subject: [PATCH 6/7] remove package from template, fixed bottom nav with agp upgrade --- .../src/org/sensorhub/android/MainActivity.java | 17 +++++++---------- sensorhub-android-template/AndroidManifest.xml | 3 +-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java b/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java index 8c0cc8a2..81ff8b50 100644 --- a/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java +++ b/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java @@ -630,16 +630,13 @@ else if (sensorsFragment != null && !sensorsFragment.isHidden()) BottomNavigationView bottomNav = findViewById(R.id.bottom_nav); bottomNav.setOnNavigationItemSelectedListener(item -> { - switch (item.getItemId()) { - case R.id.dashboard: - switchFragment(homeFragment, getString(R.string.app_name)); - break; - case R.id.sensors: - switchFragment(sensorsFragment, getString(R.string.tab_sensors)); - break; - case R.id.settings: - switchFragment(settingsFragment, getString(R.string.tab_settings)); - break; + int itemId = item.getItemId(); + if (itemId == R.id.dashboard) { + switchFragment(homeFragment, getString(R.string.app_name)); + } else if (itemId == R.id.sensors) { + switchFragment(sensorsFragment, getString(R.string.tab_sensors)); + } else if (itemId == R.id.settings) { + switchFragment(settingsFragment, getString(R.string.tab_settings)); } return true; }); diff --git a/sensorhub-android-template/AndroidManifest.xml b/sensorhub-android-template/AndroidManifest.xml index d2a3abe1..6f6edbca 100644 --- a/sensorhub-android-template/AndroidManifest.xml +++ b/sensorhub-android-template/AndroidManifest.xml @@ -1,5 +1,4 @@ - + From 2106c01f093f65d27ef579a737233a3ed84e0750 Mon Sep 17 00:00:00 2001 From: kalynstricklin Date: Fri, 21 Aug 2026 11:31:34 -0500 Subject: [PATCH 7/7] Added flag to all receivers and fixed foreground service causing app to crash --- sensorhub-android-app/AndroidManifest.xml | 6 ++++-- .../src/org/sensorhub/android/MainActivity.java | 2 +- .../src/org/sensorhub/android/SOSServiceWithIPC.java | 2 +- .../sensorhub/impl/sensor/swe/ProxySensor/ProxySensor.java | 2 +- .../src/org/sensorhub/android/comm/BluetoothManager.java | 2 +- .../org/sensorhub/impl/sensor/wardriving/Wardriving.java | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sensorhub-android-app/AndroidManifest.xml b/sensorhub-android-app/AndroidManifest.xml index 8e6d9fb0..4b0dc5fe 100644 --- a/sensorhub-android-app/AndroidManifest.xml +++ b/sensorhub-android-app/AndroidManifest.xml @@ -27,6 +27,9 @@ + + + @@ -86,8 +89,7 @@ android:name=".SensorHubService" android:enabled="true" android:foregroundServiceType="location|camera|microphone" - android:exported="false" - tools:ignore="ForegroundServicePermission" /> + android:exported="false" /> diff --git a/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java b/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java index 81ff8b50..0e4ec21e 100644 --- a/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java +++ b/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java @@ -862,6 +862,6 @@ public void onReceive(Context context, Intent intent) { }; IntentFilter filter = new IntentFilter(); filter.addAction(ACTION_BROADCAST_RECEIVER); - registerReceiver(broadcastReceiver, filter); + registerReceiver(broadcastReceiver, filter, RECEIVER_NOT_EXPORTED); } } diff --git a/sensorhub-android-app/src/org/sensorhub/android/SOSServiceWithIPC.java b/sensorhub-android-app/src/org/sensorhub/android/SOSServiceWithIPC.java index 2cd5d5e3..e816a63a 100644 --- a/sensorhub-android-app/src/org/sensorhub/android/SOSServiceWithIPC.java +++ b/sensorhub-android-app/src/org/sensorhub/android/SOSServiceWithIPC.java @@ -54,7 +54,7 @@ public void onReceive(Context context, Intent intent) IntentFilter filter = new IntentFilter(); filter.addAction(ACTION_SOS); - androidContext.registerReceiver(receiver, filter); + androidContext.registerReceiver(receiver, filter, Context.RECEIVER_NOT_EXPORTED); } @Override diff --git a/sensorhub-android-app/src/org/sensorhub/impl/sensor/swe/ProxySensor/ProxySensor.java b/sensorhub-android-app/src/org/sensorhub/impl/sensor/swe/ProxySensor/ProxySensor.java index 1d839606..57b1b019 100644 --- a/sensorhub-android-app/src/org/sensorhub/impl/sensor/swe/ProxySensor/ProxySensor.java +++ b/sensorhub-android-app/src/org/sensorhub/impl/sensor/swe/ProxySensor/ProxySensor.java @@ -72,7 +72,7 @@ public void onReceive(Context context, Intent intent) { IntentFilter filter = new IntentFilter(); filter.addAction(ACTION_PROXY); - androidContext.registerReceiver(receiver, filter); + androidContext.registerReceiver(receiver, filter, Context.RECEIVER_NOT_EXPORTED); Log.d(TAG, "Starting Proxy Sensor"); diff --git a/sensorhub-android-service/src/org/sensorhub/android/comm/BluetoothManager.java b/sensorhub-android-service/src/org/sensorhub/android/comm/BluetoothManager.java index 3d47b583..ef961ec4 100644 --- a/sensorhub-android-service/src/org/sensorhub/android/comm/BluetoothManager.java +++ b/sensorhub-android-service/src/org/sensorhub/android/comm/BluetoothManager.java @@ -94,7 +94,7 @@ public void onReceive(Context context, Intent intent) } } } - }, filter); // Don't forget to unregister during onDestroy + }, filter, Context.RECEIVER_EXPORTED); // Getting the Bluetooth adapter BluetoothAdapter btAdapter = BluetoothAdapter.getDefaultAdapter(); diff --git a/sensorhub-android-wardriving/src/main/java/org/sensorhub/impl/sensor/wardriving/Wardriving.java b/sensorhub-android-wardriving/src/main/java/org/sensorhub/impl/sensor/wardriving/Wardriving.java index f806e839..f2f2fd24 100644 --- a/sensorhub-android-wardriving/src/main/java/org/sensorhub/impl/sensor/wardriving/Wardriving.java +++ b/sensorhub-android-wardriving/src/main/java/org/sensorhub/impl/sensor/wardriving/Wardriving.java @@ -133,7 +133,7 @@ public void onReceive(Context ctx, Intent intent) { }; IntentFilter filter = new IntentFilter(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION); - context.registerReceiver(wifiReceiver, filter); + context.registerReceiver(wifiReceiver, filter, Context.RECEIVER_EXPORTED); // start GPS location updates startLocationUpdates();