Add (estimated) Carrier Aggregation cells

* Add Carrier Aggregation cell list to model
* Add Carrier Aggregation cells API endpoints:
  * /estimate-ca/all    : returns a list of estimated Carrier Aggregation cells
    - if more than 1 cells have the status connected, return them all as Carrier Aggregation cells
    - if only a single cell is connected, take the best-RSRQ cell from the available cells (CA estimation)
  * /estimate-ca/{id}   : returns the cell information of a single cell

Author: bastian-src

app/src/main/java/eu/bschmidt/devicepublisher/api/celldata/routeCellData.kt

@@ -33,6 +33,12 @@ suspend fun getAvailableCells(viewModel: CellDataViewModel): MutableList<CellDat
     return localCellList
 }
 
+suspend fun getCACells(viewModel: CellDataViewModel): MutableList<CellData> {
+    val localCellList: MutableList<CellData> = mutableListOf<CellData>()
+    localCellList.addAll(viewModel.getCACells().toMutableList())
+    return localCellList
+}
+
 fun Route.routeCellData() {
     val viewModel: CellDataViewModel = CellDataViewModel.getInstance()
 
@@ -75,6 +81,24 @@ fun Route.routeCellData() {
                 }
             }
         }
+
+        route("/estimate-ca") {
+            get("/all") {
+                val cellList = getCACells(viewModel)
+                call.respond(cellList)
+            }
+            get("/cell/{id}") {
+                val id = call.parameters["id"]?.toIntOrNull()
+                val cellList = getCACells(viewModel)
+                if (id != null && id >= 0 && id < cellList.size) {
+                    val someCell: CellData = cellList[id]
+                    call.respond(someCell)
+                } else {
+                    call.respondText("Cell not found", status = HttpStatusCode.NotFound)
+                }
+            }
+        }
+
 
     }
 }

app/src/main/java/eu/bschmidt/devicepublisher/model/celldata/CellDataViewModel.kt

@@ -51,16 +51,21 @@ class CellDataViewModel : ViewModel(), DataViewModelInterface {
 
     private val _coreConnected: MutableList<CellData> = Collections.synchronizedList(mutableListOf<CellData>())
     private val _coreAvailable: MutableList<CellData> = Collections.synchronizedList(mutableListOf<CellData>())
+    private val _coreCA: MutableList<CellData> = Collections.synchronizedList(mutableListOf<CellData>())
 
     private val _connectedCellDataList = MutableLiveData<List<CellData>>()
     val connectedCellDataList: LiveData<List<CellData>> get() = _connectedCellDataList
 
     private val _availableCellDataList = MutableLiveData<List<CellData>>()
     val availableCellDataList: LiveData<List<CellData>> get() = _availableCellDataList
 
+    private val _caCellDataList = MutableLiveData<List<CellData>>()
+    val caCellDataList: LiveData<List<CellData>> get() = _availableCellDataList
+
     init {
         _connectedCellDataList.value = emptyList()
         _availableCellDataList.value = emptyList()
+        _caCellDataList.value = emptyList()
     }
 
     /* connected */
@@ -91,6 +96,20 @@ class CellDataViewModel : ViewModel(), DataViewModelInterface {
         return _coreAvailable.toMutableList()
     }
 
+    /* Carrier Aggregation (CA) */
+
+    private fun setCACellData(newList: List<CellData>) {
+        _coreCA.clear()
+        _coreCA.addAll(newList)
+        DevPubUtils.dispatchToMainThread {
+            _caCellDataList.value = _coreCA
+        }
+    }
+
+    fun getCACells(): List<CellData> {
+        return _coreCA.toMutableList()
+    }
+
     /* logic */
 
     private fun checkPhonePermission(context: Context): Boolean {
@@ -142,6 +161,7 @@ class CellDataViewModel : ViewModel(), DataViewModelInterface {
 
         val conList: MutableList<CellData> = mutableListOf<CellData>()
         val avaList: MutableList<CellData> = mutableListOf<CellData>()
+        val caList: MutableList<CellData> = mutableListOf<CellData>()
 
         currentCells.forEach { cell ->
             if (cell !is CellLte && cell !is CellNr) {
@@ -186,12 +206,25 @@ class CellDataViewModel : ViewModel(), DataViewModelInterface {
             }
             if (cell.connectionStatus != NoneConnection()) {
                 conList.add(cellData)
+                caList.add(cellData)
             } else {
                 avaList.add(cellData)
             }
         }
+        /* If there is one connected cell, take the best-RSRQ cell
+           as an "estimate" to the potential Carrier Aggregation cells
+         */
+        if (caList.size == 1 && avaList.size >= 1) {
+            val lowestRsrqCell = avaList
+                .filter { it.rsrq != null }
+                .maxByOrNull { it.rsrq!! }
+            if (lowestRsrqCell != null) {
+                caList.add(lowestRsrqCell)
+            }
+        }
         setConnectedCellData(conList)
         setAvailableCellData(avaList)
+        setCACellData(caList)
     }
 
     companion object {