@@ -68,13 +68,59 @@ package io.matthewnelson.sampleapp
6868
6969import androidx.lifecycle.LiveData
7070import androidx.lifecycle.MutableLiveData
71- import io.matthewnelson.topl_core_base.EventBroadcaster
71+ import io.matthewnelson.topl_core_base.BaseConsts
72+ import io.matthewnelson.topl_service.service.components.onionproxy.TorServiceEventBroadcaster
7273import io.matthewnelson.topl_service.util.ServiceUtilities
7374
7475/* *
7576 * @suppress
7677 * */
77- class MyEventBroadcaster : EventBroadcaster () {
78+ class MyEventBroadcaster : TorServiceEventBroadcaster () {
79+
80+
81+ // ////////////////////////
82+ // / ControlPortAddress ///
83+ // ////////////////////////
84+
85+ // Make Volatile so that if referencing on a different thread, we get
86+ // the update immediately
87+ @Volatile
88+ var controlPortAddress: String? = null
89+ private set
90+
91+ override fun broadcastControlPortAddress (controlPortAddress : String? ) {
92+ this .controlPortAddress = controlPortAddress
93+ }
94+
95+
96+ // //////////////////////
97+ // / SocksPortAddress ///
98+ // //////////////////////
99+
100+ // Make Volatile so that if referencing on a different thread, we get
101+ // the update immediately
102+ @Volatile
103+ var socksPortAddress: String? = null
104+ private set
105+
106+ override fun broadcastSocksPortAddress (socksPortAddress : String? ) {
107+ this .socksPortAddress = socksPortAddress
108+ }
109+
110+
111+ // /////////////////////
112+ // / HttpPortAddress ///
113+ // /////////////////////
114+
115+ // Make Volatile so that if referencing on a different thread, we get
116+ // the update immediately
117+ @Volatile
118+ var httpPortAddress: String? = null
119+ private set
120+
121+ override fun broadcastHttpPortAddress (httpPortAddress : String? ) {
122+ this .httpPortAddress = httpPortAddress
123+ }
78124
79125
80126 // ///////////////
@@ -137,15 +183,15 @@ class MyEventBroadcaster: EventBroadcaster() {
137183 // /////////////////
138184 inner class TorStateData (val state : String , val networkState : String )
139185
140- private var lastState = TorState .OFF
141- private var lastNetworkState = TorNetworkState .DISABLED
186+ private var lastState = BaseConsts . TorState .OFF
187+ private var lastNetworkState = BaseConsts . TorNetworkState .DISABLED
142188
143189 private val _liveTorState = MutableLiveData <TorStateData >(
144190 TorStateData (lastState, lastNetworkState)
145191 )
146192 val liveTorState: LiveData <TorStateData > = _liveTorState
147193
148- override fun broadcastTorState (@TorState state : String , @TorNetworkState networkState : String ) {
194+ override fun broadcastTorState (@BaseConsts. TorState state : String , @BaseConsts. TorNetworkState networkState : String ) {
149195 if (state == lastState && networkState == lastNetworkState) return
150196
151197 lastState = state
0 commit comments