caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix NSClientFragment

Browse source
This commit is contained in:
Milos Kozak 2022-06-28 18:07:59 +02:00
parent c9dda14c06
commit b223dfbaf0
1 changed files with 0 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.kt
View file

@ -17,15 +17,9 @@ import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientU
import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.FabricPrivacy
import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.alertDialogs.OKDialog
import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.androidaps.utils.rx.AapsSchedulers
import info.nightscout.sdk.NSAndroidClient
import info.nightscout.shared.logging.AAPSLogger
import info.nightscout.shared.sharedPreferences.SP import info.nightscout.shared.sharedPreferences.SP
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.kotlin.plusAssign
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.launch
import javax.inject.Inject import javax.inject.Inject
class NSClientFragment : DaggerFragment() { class NSClientFragment : DaggerFragment() {
@ -38,7 +32,6 @@ class NSClientFragment : DaggerFragment() {
@Inject lateinit var aapsSchedulers: AapsSchedulers @Inject lateinit var aapsSchedulers: AapsSchedulers
@Inject lateinit var dataSyncSelector: DataSyncSelector @Inject lateinit var dataSyncSelector: DataSyncSelector
@Inject lateinit var uel: UserEntryLogger @Inject lateinit var uel: UserEntryLogger
@Inject lateinit var aapsLogger: AAPSLogger
companion object { companion object {
@ -46,7 +39,6 @@ class NSClientFragment : DaggerFragment() {
const val ID_MENU_RESTART = 7 const val ID_MENU_RESTART = 7
const val ID_MENU_SEND_NOW = 8 const val ID_MENU_SEND_NOW = 8
const val ID_MENU_FULL_SYNC = 9 const val ID_MENU_FULL_SYNC = 9
const val ID_MENU_STATUS = 10
} }
private val disposable = CompositeDisposable() private val disposable = CompositeDisposable()
@ -88,7 +80,6 @@ class NSClientFragment : DaggerFragment() {
menu.add(Menu.FIRST, ID_MENU_RESTART, 0, rh.gs(R.string.restart)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) menu.add(Menu.FIRST, ID_MENU_RESTART, 0, rh.gs(R.string.restart)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
menu.add(Menu.FIRST, ID_MENU_SEND_NOW, 0, rh.gs(R.string.deliver_now)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) menu.add(Menu.FIRST, ID_MENU_SEND_NOW, 0, rh.gs(R.string.deliver_now)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
menu.add(Menu.FIRST, ID_MENU_FULL_SYNC, 0, rh.gs(R.string.full_sync)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) menu.add(Menu.FIRST, ID_MENU_FULL_SYNC, 0, rh.gs(R.string.full_sync)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
menu.add(Menu.FIRST, ID_MENU_STATUS, 0, "TEST STATUS").setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
menu.setGroupDividerEnabled(true) menu.setGroupDividerEnabled(true)
} }
} }
@ -120,25 +111,6 @@ class NSClientFragment : DaggerFragment() {
true true
} }
ID_MENU_STATUS -> {
context?.let { context ->
val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
scope.launch {
val client = NSAndroidClient(
baseUrl = sp.getString(R.string.key_nsclientinternal_url, "").lowercase().replace("https://", ""),
accessToken = sp.getString(R.string.key_nsclient_token, ""),
context = context,
logging = true
)
val status = client.getStatus()
aapsLogger.debug(status.toString())
val svgs = client.getSgvs()
aapsLogger.debug(svgs.toString())
}
}
true
}
else -> false else -> false
} }