ail-23 Add logic for getting "OS" information from network

AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/DeviceInformation.kt

@@ -22,8 +22,6 @@ interface DeviceInformation {
     )
     fun getSIMCardInformation(context: Context): SIMCardInformation
 
-    fun getNetworkInformation(): NetworkInformation
-
     fun getNetworkTechnologiesInformation(context: Context): NetworkTechnologiesInformation
 
     fun getOSInformation(): OSInformation

AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/DeviceInformationFactory.kt

@@ -4,13 +4,13 @@ import android.Manifest
 import android.content.Context
 import androidx.annotation.RequiresPermission
 import androidx.annotation.WorkerThread
-import com.udfsoft.androidinfo.lib.command.GetOSInformationCommand
 import com.udfsoft.androidinfo.lib.command.GetRAMInformationCommand
 import com.udfsoft.androidinfo.lib.command.cpu.GetCpuInformationCommand
 import com.udfsoft.androidinfo.lib.command.design.GetNetworkDesignInformationCommand
 import com.udfsoft.androidinfo.lib.command.display.GetDisplayInformationCommand
 import com.udfsoft.androidinfo.lib.command.general.GetGeneralInformationCommand
 import com.udfsoft.androidinfo.lib.command.network.GetNetworkTechnologiesInformationCommand
+import com.udfsoft.androidinfo.lib.command.os.GetOSInformationCommand
 import com.udfsoft.androidinfo.lib.command.sim.GetSIMCardInformationCommand
 import com.udfsoft.androidinfo.lib.di.NetworkFactory
 import com.udfsoft.androidinfo.lib.entity.*
@@ -32,18 +32,17 @@ object DeviceInformationFactory : DeviceInformation {
     override fun getSIMCardInformation(context: Context) =
         GetSIMCardInformationCommand(context, api).invoke(Unit)
 
-    override fun getNetworkInformation(): NetworkInformation {
-        TODO("Not yet implemented")
-    }
-
     @RequiresPermission(
         allOf = [Manifest.permission.INTERNET, Manifest.permission.ACCESS_NETWORK_STATE]
     )
     override fun getNetworkTechnologiesInformation(context: Context) =
         GetNetworkTechnologiesInformationCommand(context, api).invoke(Unit)
 
+    @RequiresPermission(
+        allOf = [Manifest.permission.INTERNET, Manifest.permission.ACCESS_NETWORK_STATE]
+    )
     override fun getOSInformation(): OSInformation {
-        val getOSInformationCommand = GetOSInformationCommand()
+        val getOSInformationCommand = GetOSInformationCommand(api)
         return getOSInformationCommand(Unit)
     }
 

AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/command/entity/os/MutableOSInformation.kt

@@ -0,0 +1,25 @@
+package com.udfsoft.androidinfo.lib.command.entity.os
+
+import com.udfsoft.androidinfo.lib.command.entity.MutableEntity
+import com.udfsoft.androidinfo.lib.entity.OSInformation
+
+data class MutableOSInformation(
+    var manufacturer: String? = null,
+    var version: Int = 0,
+    var versionRelease: String? = null,
+    var incremental: String? = null,
+    var codeName: String? = null,
+    var linuxVersion: String? = null,
+    var operatingSystem: String? = null
+) : MutableEntity<OSInformation> {
+
+    override fun build() = OSInformation(
+        manufacturer,
+        version,
+        versionRelease,
+        incremental,
+        codeName,
+        linuxVersion,
+        operatingSystem
+    )
+}

AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/command/entity/os/OSIds.kt

@@ -0,0 +1,5 @@
+package com.udfsoft.androidinfo.lib.command.entity.os
+
+enum class OSIds(val id: Int) {
+    OperatingSystem(6190)
+}

AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/command/os/GetCloudOSInformationCommand.kt

@@ -0,0 +1,25 @@
+package com.udfsoft.androidinfo.lib.command.os
+
+import com.udfsoft.androidinfo.lib.command.BaseGetCloudInformationCommand
+import com.udfsoft.androidinfo.lib.command.entity.MenuIds
+import com.udfsoft.androidinfo.lib.command.entity.os.MutableOSInformation
+import com.udfsoft.androidinfo.lib.command.entity.os.OSIds
+import com.udfsoft.androidinfo.lib.network.AndroidInfoApi
+import com.udfsoft.androidinfo.lib.network.entity.DeviceInformationItemNetwork
+
+class GetCloudOSInformationCommand(
+    api: AndroidInfoApi
+) : BaseGetCloudInformationCommand<MutableOSInformation>(
+    api,
+    MenuIds.MENU_ID_OS
+) {
+
+    override fun processInfo(
+        item: DeviceInformationItemNetwork,
+        entity: MutableOSInformation
+    ) {
+        when (item.id) {
+            OSIds.OperatingSystem.id -> entity.operatingSystem = item.value
+        }
+    }
+}

AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/command/os/GetLocalOSInformationCommand.kt

@@ -0,0 +1,24 @@
+package com.udfsoft.androidinfo.lib.command.os
+
+import android.Manifest
+import android.os.Build
+import androidx.annotation.RequiresPermission
+import com.udfsoft.androidinfo.lib.command.BaseGetLocalInformationCommand
+import com.udfsoft.androidinfo.lib.command.entity.os.MutableOSInformation
+
+class GetLocalOSInformationCommand : BaseGetLocalInformationCommand<MutableOSInformation>() {
+
+    @RequiresPermission(
+        allOf = [Manifest.permission.INTERNET, Manifest.permission.ACCESS_NETWORK_STATE]
+    )
+    override fun invoke(param: MutableOSInformation): MutableOSInformation {
+        param.manufacturer = Build.MANUFACTURER
+        param.version = Build.VERSION.SDK_INT
+        param.versionRelease = Build.VERSION.RELEASE
+        param.incremental = Build.VERSION.INCREMENTAL
+        param.codeName = Build.VERSION.CODENAME
+        param.linuxVersion = System.getProperty("os.version")
+
+        return param
+    }
+}

AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/command/os/GetOSInformationCommand.kt

@@ -0,0 +1,22 @@
+package com.udfsoft.androidinfo.lib.command.os
+
+import android.Manifest
+import androidx.annotation.RequiresPermission
+import com.udfsoft.androidinfo.lib.command.CommandInterface
+import com.udfsoft.androidinfo.lib.command.entity.os.MutableOSInformation
+import com.udfsoft.androidinfo.lib.entity.OSInformation
+import com.udfsoft.androidinfo.lib.network.AndroidInfoApi
+
+class GetOSInformationCommand(val api: AndroidInfoApi) : CommandInterface<Unit, OSInformation> {
+
+    @RequiresPermission(
+        allOf = [Manifest.permission.INTERNET, Manifest.permission.ACCESS_NETWORK_STATE]
+    )
+    override fun invoke(param: Unit): OSInformation {
+        val mutableEntity = MutableOSInformation()
+        GetLocalOSInformationCommand().invoke(mutableEntity)
+        GetCloudOSInformationCommand(api).invoke(mutableEntity)
+
+        return mutableEntity.build()
+    }
+}

AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/entity/OSInformation.kt

@@ -1,10 +1,11 @@
 package com.udfsoft.androidinfo.lib.entity
 
 data class OSInformation(
-    val manufacturer: String,
+    val manufacturer: String?,
     val version: Int,
-    val versionRelease: String,
-    val incremental: String,
-    val codeName: String,
-    val linuxVersion: String?
+    val versionRelease: String?,
+    val incremental: String?,
+    val codeName: String?,
+    val linuxVersion: String?,
+    val operatingSystem: String?
 )