Commit 9cf8c4c4 authored by Max Lv's avatar Max Lv

Drop the broken support of autostart below Lolipop

Close #525
parent bfbbb90a
......@@ -43,11 +43,10 @@ import android.app.{Activity, KeyguardManager}
import android.content.{Intent, IntentFilter, Context, BroadcastReceiver}
import android.net.VpnService
import android.os.{Bundle, Handler}
import android.support.v7.app.AppCompatActivity
import android.util.Log
import com.github.shadowsocks.utils.ConfigUtils
class ShadowsocksRunnerActivity extends AppCompatActivity with ServiceBoundContext {
class ShadowsocksRunnerActivity extends Activity with ServiceBoundContext {
val handler = new Handler()
// Variables
......
......@@ -55,7 +55,7 @@ import android.util.{DisplayMetrics, Base64, Log}
import android.view.View.MeasureSpec
import android.view.{Gravity, View, Window}
import android.widget.Toast
import com.github.shadowsocks.{ShadowsocksRunnerActivity, ShadowsocksRunnerService, ShadowsocksApplication, BuildConfig}
import com.github.shadowsocks.{ShadowsocksRunnerService, ShadowsocksApplication, BuildConfig}
import org.xbill.DNS._
......@@ -405,15 +405,8 @@ object Utils {
val isInstalled: Boolean = ShadowsocksApplication.settings.getBoolean(ShadowsocksApplication.getVersionName, false)
if (!isInstalled) return
if (Utils.isLollipopOrAbove) {
val intent = new Intent(context, classOf[ShadowsocksRunnerService])
context.startService(intent)
} else {
val intent = new Intent(context, classOf[ShadowsocksRunnerActivity])
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
context.startActivity(intent)
}
val intent = new Intent(context, classOf[ShadowsocksRunnerService])
context.startService(intent)
}
def stopSsService(context: Context): Unit = {
......
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