Commit ef98c4a2 authored by Mygod's avatar Mygod

Fix Handler constructor deprecation

parent f0f18181
...@@ -26,6 +26,7 @@ import android.content.Intent ...@@ -26,6 +26,7 @@ import android.content.Intent
import android.content.ServiceConnection import android.content.ServiceConnection
import android.os.Handler import android.os.Handler
import android.os.IBinder import android.os.IBinder
import android.os.Looper
import android.os.RemoteException import android.os.RemoteException
import com.github.shadowsocks.bg.BaseService import com.github.shadowsocks.bg.BaseService
import com.github.shadowsocks.bg.ProxyService import com.github.shadowsocks.bg.ProxyService
...@@ -38,7 +39,7 @@ import com.github.shadowsocks.utils.Key ...@@ -38,7 +39,7 @@ import com.github.shadowsocks.utils.Key
/** /**
* This object should be compact as it will not get GC-ed. * This object should be compact as it will not get GC-ed.
*/ */
class ShadowsocksConnection(private val handler: Handler = Handler(), class ShadowsocksConnection(private val handler: Handler = Handler(Looper.getMainLooper()),
private var listenForDeath: Boolean = false) : private var listenForDeath: Boolean = false) :
ServiceConnection, IBinder.DeathRecipient { ServiceConnection, IBinder.DeathRecipient {
companion object { companion object {
......
...@@ -27,6 +27,7 @@ import android.content.Intent ...@@ -27,6 +27,7 @@ import android.content.Intent
import android.net.VpnService import android.net.VpnService
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.os.Looper
import android.os.RemoteException import android.os.RemoteException
import android.view.* import android.view.*
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
...@@ -130,7 +131,7 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPref ...@@ -130,7 +131,7 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPref
else -> Core.startService() else -> Core.startService()
} }
private val handler = Handler() private val handler = Handler(Looper.getMainLooper())
private val connection = ShadowsocksConnection(handler, true) private val connection = ShadowsocksConnection(handler, true)
override fun onServiceConnected(service: IShadowsocksService) = changeState(try { override fun onServiceConnected(service: IShadowsocksService) = changeState(try {
BaseService.State.values()[service.state] BaseService.State.values()[service.state]
......
...@@ -27,6 +27,7 @@ import android.content.Intent ...@@ -27,6 +27,7 @@ import android.content.Intent
import android.net.VpnService import android.net.VpnService
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.os.Looper
import android.os.RemoteException import android.os.RemoteException
import android.text.format.Formatter import android.text.format.Formatter
import android.widget.Toast import android.widget.Toast
...@@ -117,7 +118,7 @@ class MainPreferenceFragment : LeanbackPreferenceFragmentCompat(), ShadowsocksCo ...@@ -117,7 +118,7 @@ class MainPreferenceFragment : LeanbackPreferenceFragmentCompat(), ShadowsocksCo
} }
} }
private val handler = Handler() private val handler = Handler(Looper.getMainLooper())
private val connection = ShadowsocksConnection(handler, true) private val connection = ShadowsocksConnection(handler, true)
override fun onServiceConnected(service: IShadowsocksService) = changeState(try { override fun onServiceConnected(service: IShadowsocksService) = changeState(try {
BaseService.State.values()[service.state] BaseService.State.values()[service.state]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment