fix: intent null bugs and prepareMainLooper

SonicCloudOrg · Jan 20, 2023 · bc1ee16 · bc1ee16
1 parent cfa0a36
commit bc1ee16
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/src/main/java/org/cloud/sonic/android/model/SonicWifiPacket.kt b/app/src/main/java/org/cloud/sonic/android/model/SonicWifiPacket.kt
@@ -29,7 +29,7 @@ data class SonicWifiPacket(
 
 data class SonicWifiInfo(
  var SSID: String = "",
- var BSSID: String = "",
+ var BSSID: String ?= "",
  var capabilities: String = "",
  var ipAddress: String = "",
  var macAddress: String = ""

diff --git a/app/src/main/java/org/cloud/sonic/android/plugin/SonicPluginTouchService.kt b/app/src/main/java/org/cloud/sonic/android/plugin/SonicPluginTouchService.kt
@@ -81,7 +81,7 @@ class SonicPluginTouchService(var width: Int = 0, var handler: Handler?) :
  @JvmStatic
  fun main(args: Array<String>) {
  try {
- Looper.prepare()
+ Looper.prepareMainLooper()
  val handler = Handler()
  val size: Point? = getScreenSize()
  if (size != null) {

diff --git a/app/src/main/java/org/cloud/sonic/android/service/SonicManagerServiceV2.kt b/app/src/main/java/org/cloud/sonic/android/service/SonicManagerServiceV2.kt
@@ -111,7 +111,7 @@ class SonicManagerServiceV2 : Service(), TcpServerListener {
 
  override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
  LogUtils.i("onStartCommand")
- val action = intent!!.action
+ val action = intent?.action
  if (ACTION_STOP == action) {
  closeSocket()
  return START_NOT_STICKY
@@ -232,7 +232,7 @@ class SonicManagerServiceV2 : Service(), TcpServerListener {
  private fun closeSocket() {
  isSocketStop = true
  mSonicTcpServer?.let {
- if(it.isListening()) {
+ if (it.isListening()) {
  it.removeTcpServerListener(this)
  it.stopServer()
  }