Commit 2e1564b7 authored by Mygod's avatar Mygod

Remove usage of BuildCompat

parent 250373b9
...@@ -21,16 +21,14 @@ ...@@ -21,16 +21,14 @@
package com.github.shadowsocks package com.github.shadowsocks
import java.io.{File, IOException} import java.io.{File, IOException}
import java.net.{Inet6Address, InetAddress}
import java.util import java.util
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import java.util.{Timer, TimerTask} import java.util.{Timer, TimerTask}
import java.net.InetAddress
import java.net.Inet6Address
import android.app.Service import android.app.Service
import android.content.{BroadcastReceiver, Context, Intent, IntentFilter} import android.content.{BroadcastReceiver, Context, Intent, IntentFilter}
import android.os.{Handler, IBinder, RemoteCallbackList} import android.os.{Build, Handler, IBinder, RemoteCallbackList}
import android.support.v4.os.BuildCompat
import android.text.TextUtils import android.text.TextUtils
import android.util.Log import android.util.Log
import android.widget.Toast import android.widget.Toast
...@@ -166,7 +164,7 @@ trait BaseService extends Service { ...@@ -166,7 +164,7 @@ trait BaseService extends Service {
def startRunner(profile: Profile) { def startRunner(profile: Profile) {
this.profile = profile this.profile = profile
if (BuildCompat.isAtLeastO) startForegroundService(new Intent(this, getClass)) if (Build.VERSION.SDK_INT >= 26) startForegroundService(new Intent(this, getClass))
else startService(new Intent(this, getClass)) else startService(new Intent(this, getClass))
TrafficMonitor.reset() TrafficMonitor.reset()
trafficMonitorThread = new TrafficMonitorThread(getApplicationContext) trafficMonitorThread = new TrafficMonitorThread(getApplicationContext)
......
...@@ -29,7 +29,6 @@ import android.content._ ...@@ -29,7 +29,6 @@ import android.content._
import android.content.res.Configuration import android.content.res.Configuration
import android.os.{Build, LocaleList} import android.os.{Build, LocaleList}
import android.preference.PreferenceManager import android.preference.PreferenceManager
import android.support.v4.os.BuildCompat
import android.support.v7.app.AppCompatDelegate import android.support.v7.app.AppCompatDelegate
import android.util.Log import android.util.Log
import com.evernote.android.job.JobManager import com.evernote.android.job.JobManager
...@@ -43,8 +42,8 @@ import com.google.firebase.remoteconfig.FirebaseRemoteConfig ...@@ -43,8 +42,8 @@ import com.google.firebase.remoteconfig.FirebaseRemoteConfig
import com.j256.ormlite.logger.LocalLog import com.j256.ormlite.logger.LocalLog
import eu.chainfire.libsuperuser.Shell import eu.chainfire.libsuperuser.Shell
import scala.collection.mutable.ArrayBuffer
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._
import scala.collection.mutable.ArrayBuffer
object ShadowsocksApplication { object ShadowsocksApplication {
var app: ShadowsocksApplication = _ var app: ShadowsocksApplication = _
...@@ -157,7 +156,7 @@ class ShadowsocksApplication extends Application { ...@@ -157,7 +156,7 @@ class ShadowsocksApplication extends Application {
TcpFastOpen.enabled(settings.getBoolean(Key.tfo, TcpFastOpen.sendEnabled)) TcpFastOpen.enabled(settings.getBoolean(Key.tfo, TcpFastOpen.sendEnabled))
if (BuildCompat.isAtLeastO) getSystemService(classOf[NotificationManager]).createNotificationChannels(List( if (Build.VERSION.SDK_INT >= 26) getSystemService(classOf[NotificationManager]).createNotificationChannels(List(
new NotificationChannel("service-vpn", getText(R.string.service_vpn), NotificationManager.IMPORTANCE_MIN), new NotificationChannel("service-vpn", getText(R.string.service_vpn), NotificationManager.IMPORTANCE_MIN),
new NotificationChannel("service-nat", getText(R.string.service_nat), NotificationManager.IMPORTANCE_LOW) new NotificationChannel("service-nat", getText(R.string.service_nat), NotificationManager.IMPORTANCE_LOW)
)) ))
......
...@@ -23,7 +23,7 @@ package com.github.shadowsocks ...@@ -23,7 +23,7 @@ package com.github.shadowsocks
import android.app.Service import android.app.Service
import android.content.Intent import android.content.Intent
import android.net.VpnService import android.net.VpnService
import android.os.{Handler, IBinder} import android.os.{Build, Handler, IBinder}
import android.support.v4.app.NotificationCompat import android.support.v4.app.NotificationCompat
import android.support.v4.os.BuildCompat import android.support.v4.os.BuildCompat
import com.github.shadowsocks.ShadowsocksApplication.app import com.github.shadowsocks.ShadowsocksApplication.app
...@@ -49,7 +49,7 @@ class ShadowsocksRunnerService extends Service with ServiceBoundContext { ...@@ -49,7 +49,7 @@ class ShadowsocksRunnerService extends Service with ServiceBoundContext {
override def onCreate() { override def onCreate() {
super.onCreate() super.onCreate()
if (BuildCompat.isAtLeastO) { if (Build.VERSION.SDK_INT >= 26) {
val builder = new NotificationCompat.Builder(this) val builder = new NotificationCompat.Builder(this)
builder.setPriority(NotificationCompat.PRIORITY_MIN) builder.setPriority(NotificationCompat.PRIORITY_MIN)
startForeground(1, builder.build) startForeground(1, builder.build)
......
...@@ -28,7 +28,6 @@ import android.content.pm.PackageManager ...@@ -28,7 +28,6 @@ import android.content.pm.PackageManager
import android.content.{Context, Intent} import android.content.{Context, Intent}
import android.graphics._ import android.graphics._
import android.os.Build import android.os.Build
import android.support.v4.os.BuildCompat
import android.util.{Base64, DisplayMetrics, Log} import android.util.{Base64, DisplayMetrics, Log}
import android.view.View.MeasureSpec import android.view.View.MeasureSpec
import android.view.{Gravity, View, Window} import android.view.{Gravity, View, Window}
...@@ -139,7 +138,7 @@ object Utils { ...@@ -139,7 +138,7 @@ object Utils {
def startSsService(context: Context) { def startSsService(context: Context) {
val intent = new Intent(context, classOf[ShadowsocksRunnerService]) val intent = new Intent(context, classOf[ShadowsocksRunnerService])
if (BuildCompat.isAtLeastO) context.startForegroundService(intent) if (Build.VERSION.SDK_INT >= 26) context.startForegroundService(intent)
else context.startService(intent) else context.startService(intent)
} }
......
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