Merge pull request #184 from MaxKellermann/beacon

Add Beacon client for sharing live GPS locations (https://github.com/MaxKellermann/beacon)

Author: bailuk

aat-android/src/main/kotlin/ch/bailu/aat/activities/MainActivity.kt

@@ -20,6 +20,7 @@ import ch.bailu.aat_lib.dispatcher.DispatcherInterface
 import ch.bailu.aat_lib.dispatcher.source.CurrentLocationSource
 import ch.bailu.aat_lib.dispatcher.source.SensorSource
 import ch.bailu.aat_lib.dispatcher.source.TrackerSource
+import ch.bailu.aat_lib.dispatcher.source.BeaconSource
 import ch.bailu.aat_lib.dispatcher.usage.UsageTrackerAlwaysEnabled
 import ch.bailu.aat_lib.gpx.information.InfoID
 import ch.bailu.aat_lib.preferences.OnPreferencesChanged
@@ -62,6 +63,7 @@ class MainActivity : ActivityContext() {
     private fun createDispatcher(dispatcher: DispatcherInterface, appContext: AppContext) {
         val serviceContext = appContext.services
         dispatcher.addSource(TrackerSource(serviceContext, appContext.broadcaster, UsageTrackerAlwaysEnabled()))
+        dispatcher.addSource(BeaconSource(serviceContext, appContext.broadcaster, UsageTrackerAlwaysEnabled()))
         dispatcher.addSource(CurrentLocationSource(serviceContext, appContext.broadcaster))
         dispatcher.addSource(SensorSource(serviceContext, appContext.broadcaster, InfoID.SENSORS))
     }

aat-android/src/main/kotlin/ch/bailu/aat/activities/PreferencesActivity.kt

@@ -13,6 +13,7 @@ import ch.bailu.aat.views.description.mview.MultiView
 import ch.bailu.aat.views.layout.ContentView
 import ch.bailu.aat.views.preferences.GeneralPreferencesView
 import ch.bailu.aat.views.preferences.MapPreferencesView
+import ch.bailu.aat.views.preferences.NetworkPreferencesView
 import ch.bailu.aat.views.preferences.PresetPreferencesView
 import ch.bailu.aat_lib.gpx.information.InfoID
 import ch.bailu.aat_lib.preferences.OnPreferencesChanged
@@ -23,6 +24,11 @@ class PreferencesActivity : ActivityContext(), OnPreferencesChanged {
     companion object {
         @JvmField
         val SOLID_KEY: String = PreferencesActivity::class.java.simpleName
+
+        /**
+         * The number of pages not counting the "preset" pages.
+         */
+        private const val N_BASE_PAGES = 3
     }
 
     private val theme = AppTheme.preferences
@@ -63,6 +69,13 @@ class PreferencesActivity : ActivityContext(), OnPreferencesChanged {
             mapTilePreferences,
             getString(R.string.p_tiles)
         )
+        multiView.add(
+            NetworkPreferencesView(this, theme),
+            "Network"
+        )
+
+        assert(multiView.pageCount() == N_BASE_PAGES);
+
         addPresetPreferences(multiView, theme)
         return multiView
     }
@@ -94,7 +107,7 @@ class PreferencesActivity : ActivityContext(), OnPreferencesChanged {
     }
 
     private fun addPresetPreferences(multiView: MultiView, theme: UiTheme) {
-        while (multiView.pageCount() > 2) multiView.remove(multiView.pageCount() - 1)
+        while (multiView.pageCount() > N_BASE_PAGES) multiView.remove(multiView.pageCount() - 1)
 
         for (i in 0 until getPresetCount()) {
             multiView.add(

aat-android/src/main/kotlin/ch/bailu/aat/services/OneService.kt

@@ -2,6 +2,7 @@ package ch.bailu.aat.services
 
 import android.content.Context
 import ch.bailu.aat.app.AndroidAppContext
+import ch.bailu.aat.preferences.Storage
 import ch.bailu.aat.preferences.location.AndroidSolidLocationProvider
 import ch.bailu.aat.services.sensor.SensorService
 import ch.bailu.aat_lib.service.tileremover.TileRemoverService
@@ -24,11 +25,14 @@ import ch.bailu.aat_lib.service.render.RenderServiceInterface
 import ch.bailu.aat_lib.service.sensor.SensorServiceInterface
 import ch.bailu.aat_lib.service.tracker.TrackerService
 import ch.bailu.aat_lib.service.tracker.TrackerServiceInterface
+import ch.bailu.aat_lib.service.beacon.BeaconService
+import ch.bailu.aat_lib.service.beacon.BeaconServiceInterface
 import ch.bailu.aat_lib.util.WithStatusText
 
 class OneService : AbsService() {
     private var location: LocationService? = null
     private var tracker: TrackerService? = null
+    private var beacon: BeaconService? = null
     private var background: BackgroundServiceInterface? = null
     private var iconMap: IconMapService? = null
     private var cache: CacheServiceInterface? = null
@@ -46,6 +50,9 @@ class OneService : AbsService() {
     override fun onDestroy() {
         onDestroyCalled()
 
+        beacon?.close()
+        beacon = null
+
         tracker?.close()
         tracker = null
 
@@ -157,6 +164,12 @@ class OneService : AbsService() {
         return tracker!!
     }
 
+    @Synchronized
+    override fun getBeaconService(): BeaconServiceInterface {
+        if (beacon == null) beacon = BeaconService(this, appContext.broadcaster, Storage(this))
+        return beacon!!
+    }
+
     @Synchronized
     override fun getTileRemoverService(): TileRemoverService {
         if (tileRemover == null) tileRemover = TileRemoverService(appContext)

aat-android/src/main/kotlin/ch/bailu/aat/services/ServiceLink.kt

@@ -18,6 +18,7 @@ import ch.bailu.aat_lib.service.location.LocationServiceInterface
 import ch.bailu.aat_lib.service.render.RenderServiceInterface
 import ch.bailu.aat_lib.service.sensor.SensorServiceInterface
 import ch.bailu.aat_lib.service.tracker.TrackerServiceInterface
+import ch.bailu.aat_lib.service.beacon.BeaconServiceInterface
 import java.io.Closeable
 
 
@@ -149,6 +150,10 @@ abstract class ServiceLink(private val context: Context) : ServiceContext, Servi
         return getService()!!.getTrackerService()
     }
 
+    override fun getBeaconService(): BeaconServiceInterface {
+        return getService()!!.getBeaconService()
+    }
+
     override fun getLocationService(): LocationServiceInterface {
         return getService()!!.getLocationService()
     }

aat-android/src/main/kotlin/ch/bailu/aat/views/preferences/NetworkPreferencesView.kt

@@ -0,0 +1,39 @@
+package ch.bailu.aat.views.preferences
+
+import ch.bailu.aat.R
+import ch.bailu.aat.activities.ActivityContext
+import ch.bailu.aat.preferences.Storage
+import ch.bailu.aat.util.ui.theme.UiTheme
+import ch.bailu.aat.views.preferences.dialog.SolidTextInputDialog
+import ch.bailu.aat_lib.preferences.StorageInterface
+import ch.bailu.aat_lib.preferences.beacon.SolidBeaconEnabled
+import ch.bailu.aat_lib.preferences.beacon.SolidBeaconServer
+import ch.bailu.aat_lib.preferences.beacon.SolidBeaconKey
+
+class NetworkPreferencesView(acontext: ActivityContext, theme: UiTheme) :
+    VerticalScrollView(acontext) {
+    init {
+        val storage: StorageInterface = Storage(acontext)
+
+        add(TitleView(acontext, "Beacon", theme))
+
+        add(SolidCheckBox(acontext, SolidBeaconEnabled(storage), theme))
+
+        add(
+            SolidStringView(
+                acontext,
+                SolidBeaconServer(storage),
+                theme
+            )
+        )
+
+        add(
+            SolidTextInputView(
+                acontext,
+                SolidBeaconKey(storage),
+                SolidTextInputDialog.INTEGER,
+                theme
+            )
+        )
+    }
+}

aat-gtk/flatpak/gradle-sources.json

@@ -1532,6 +1532,27 @@
     "dest": "maven-local/com/github/bailuk/mapsforge-gtk/0.5.0",
     "dest-filename": "mapsforge-gtk-0.5.0.pom"
   },
+  {
+    "type": "file",
+    "url": "https://jitpack.io/com/github/MaxKellermann/beacon/v0.1/beacon-v0.1.jar",
+    "sha256": "5204cb1cd5367c86fcf0ca461091fe819b628154328025aea2f77bf92065dc59",
+    "dest": "maven-local/com/github/MaxKellermann/beacon/v0.1",
+    "dest-filename": "beacon-v0.1.jar"
+  },
+  {
+    "type": "file",
+    "url": "https://jitpack.io/com/github/MaxKellermann/beacon/v0.1/beacon-v0.1.module",
+    "sha256": "fc9a6d0cbe50c9b5d68b7f8d4b9559c84998528ea583a5ffd3179d92d044124a",
+    "dest": "maven-local/com/github/MaxKellermann/beacon/v0.1",
+    "dest-filename": "beacon-v0.1.module"
+  },
+  {
+    "type": "file",
+    "url": "https://jitpack.io/com/github/MaxKellermann/beacon/v0.1/beacon-v0.1.pom",
+    "sha256": "3de827a9aff1bb5eb06a454bf214cb2bcb51c32bf347c991f8e5b96f4a4f345f",
+    "dest": "maven-local/com/github/MaxKellermann/beacon/v0.1",
+    "dest-filename": "beacon-v0.1.pom"
+  },
   {
     "type": "file",
     "url": "https://plugins.gradle.org/m2/com/github/spotbugs/spotbugs-annotations/4.9.3/spotbugs-annotations-4.9.3.jar",

aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/service/GtkServices.kt

@@ -23,6 +23,8 @@ import ch.bailu.aat_lib.service.sensor.SensorServiceInterface
 import ch.bailu.aat_lib.service.tileremover.TileRemoverService
 import ch.bailu.aat_lib.service.tracker.TrackerService
 import ch.bailu.aat_lib.service.tracker.TrackerServiceInterface
+import ch.bailu.aat_lib.service.beacon.BeaconService
+import ch.bailu.aat_lib.service.beacon.BeaconServiceInterface
 
 class GtkServices (appContext: AppContext) : ServicesInterface {
     private val lazyLocationService by lazy { LocationService(
@@ -38,6 +40,12 @@ class GtkServices (appContext: AppContext) : ServicesInterface {
             this
     ) }
 
+    private val lazyBeaconService by lazy { BeaconService(
+            this,
+            appContext.broadcaster,
+            appContext.storage
+    ) }
+
     private val lazyTileRemoverService by lazy {
         TileRemoverService(appContext)
     }
@@ -92,6 +100,10 @@ class GtkServices (appContext: AppContext) : ServicesInterface {
         return lazyTrackerService
     }
 
+    override fun getBeaconService(): BeaconServiceInterface {
+        return lazyBeaconService
+    }
+
     override fun getIconMapService(): IconMapServiceInterface {
         return lazyIconMapService
     }

aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/dialog/PreferencesDialog.kt

@@ -3,6 +3,7 @@ package ch.bailu.aat_gtk.view.dialog
 import ch.bailu.aat_gtk.view.preferences.ActivityPreferencesPage
 import ch.bailu.aat_gtk.view.preferences.GeneralPreferencesPage
 import ch.bailu.aat_gtk.view.preferences.MapPreferencesPage
+import ch.bailu.aat_gtk.view.preferences.NetworkPreferencesPage
 import ch.bailu.aat_lib.app.AppContext
 import ch.bailu.gtk.adw.PreferencesDialog
 import ch.bailu.gtk.gtk.Application
@@ -15,6 +16,7 @@ object PreferencesDialog {
             window = PreferencesDialog().apply {
                 add(GeneralPreferencesPage(app, app.activeWindow, appContext).page)
                 add(MapPreferencesPage(appContext, app, app.activeWindow).page)
+                add(NetworkPreferencesPage(appContext).page)
                 add(ActivityPreferencesPage(appContext.storage).page)
 
                 onDestroy {

aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/preferences/NetworkPreferencesPage.kt

@@ -0,0 +1,17 @@
+package ch.bailu.aat_gtk.view.preferences
+
+import ch.bailu.aat_lib.app.AppContext
+import ch.bailu.aat_lib.preferences.beacon.*
+import ch.bailu.gtk.adw.PreferencesGroup
+import ch.bailu.gtk.gtk.Application
+
+class NetworkPreferencesPage(appContext: AppContext) : PreferencesPageParent("Network", "network") {
+    init {
+        page.add(PreferencesGroup().apply {
+            setTitle("Beacon")
+            add(SolidBooleanSwitchView(SolidBeaconEnabled(appContext.storage)).layout)
+            add(SolidEntryView(SolidBeaconServer(appContext.storage)).layout)
+            add(SolidEntryView(SolidBeaconKey(appContext.storage)).layout)
+        })
+    }
+}

aat-lib/build.gradle.kts

@@ -62,6 +62,8 @@ dependencies {
      *  For HtmlEscapers
      */
     implementation("com.google.guava:guava:33.5.0-jre")
+
+    implementation("com.github.MaxKellermann:beacon:v0.1")
 }
 
 testing {