autostart mechanism changed

romanvht · Dec 15, 2024 · 1fbec0b · 1fbec0b
1 parent ce9b8f4
commit 1fbec0b
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 127 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -89,18 +89,6 @@
             </intent-filter>
         </service>
 
-        <service
-            android:name=".services.AutoStartService"
-            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.accessibilityservice.AccessibilityService" />
-            </intent-filter>
-            <meta-data
-                android:name="android.accessibility_service"
-                android:resource="@xml/accessibility_service_config" />
-        </service>
-
         <receiver
             android:name=".receiver.BootReceiver"
             android:enabled="true"
@@ -109,6 +97,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+                <action android:name="android.intent.action.REBOOT" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>

diff --git a/app/src/main/java/io/github/dovecoteescapee/byedpi/activities/MainActivity.kt b/app/src/main/java/io/github/dovecoteescapee/byedpi/activities/MainActivity.kt
@@ -16,9 +16,7 @@ import android.view.MenuItem
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
-import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.lifecycleScope
 import io.github.dovecoteescapee.byedpi.R
 import io.github.dovecoteescapee.byedpi.data.*

diff --git a/app/src/main/java/io/github/dovecoteescapee/byedpi/fragments/MainSettingsFragment.kt b/app/src/main/java/io/github/dovecoteescapee/byedpi/fragments/MainSettingsFragment.kt
@@ -3,7 +3,6 @@ package io.github.dovecoteescapee.byedpi.fragments
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.provider.Settings
 import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.LocaleListCompat
@@ -12,8 +11,6 @@ import io.github.dovecoteescapee.byedpi.BuildConfig
 import io.github.dovecoteescapee.byedpi.R
 import io.github.dovecoteescapee.byedpi.activities.TestActivity
 import io.github.dovecoteescapee.byedpi.data.Mode
-import io.github.dovecoteescapee.byedpi.utility.AccessibilityUtils
-import io.github.dovecoteescapee.byedpi.services.AutoStartService
 import io.github.dovecoteescapee.byedpi.utility.*
 
 class MainSettingsFragment : PreferenceFragmentCompat() {
@@ -77,10 +74,8 @@ class MainSettingsFragment : PreferenceFragmentCompat() {
                 setTheme(newValue as String)
                 true
             }
-
-        val accessibilityStatus = findPreferenceNotNull<Preference>("accessibility_service_status")
-        val switchCommandLineSettings = findPreferenceNotNull<SwitchPreference>("byedpi_enable_cmd_settings")
-
+
+        val switchCmdSettings = findPreferenceNotNull<SwitchPreference>("byedpi_enable_cmd_settings")
         val uiSettings = findPreferenceNotNull<Preference>("byedpi_ui_settings")
         val cmdSettings = findPreferenceNotNull<Preference>("byedpi_cmd_settings")
         val proxyTest = findPreferenceNotNull<Preference>("proxy_test")
@@ -91,20 +86,14 @@ class MainSettingsFragment : PreferenceFragmentCompat() {
             proxyTest.isEnabled = enable
         }
 
-        setByeDpiSettingsMode(switchCommandLineSettings.isChecked)
+        setByeDpiSettingsMode(switchCmdSettings.isChecked)
 
-        switchCommandLineSettings.setOnPreferenceChangeListener { _, newValue ->
+        switchCmdSettings.setOnPreferenceChangeListener { _, newValue ->
             setByeDpiSettingsMode(newValue as Boolean)
             updatePreferences()
             true
         }
 
-        accessibilityStatus.setOnPreferenceClickListener {
-            val intent = Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
-            startActivity(intent)
-            true
-        }
-
         findPreferenceNotNull<Preference>("proxy_test")
             .setOnPreferenceClickListener {
                 val intent = Intent(context, TestActivity::class.java)
@@ -114,14 +103,12 @@ class MainSettingsFragment : PreferenceFragmentCompat() {
 
         findPreferenceNotNull<Preference>("version").summary = BuildConfig.VERSION_NAME
 
-        updateAccessibilityStatus()
         updatePreferences()
     }
 
     override fun onResume() {
         super.onResume()
         sharedPreferences?.registerOnSharedPreferenceChangeListener(preferenceListener)
-        updateAccessibilityStatus()
         updatePreferences()
     }
 
@@ -179,17 +166,4 @@ class MainSettingsFragment : PreferenceFragmentCompat() {
             }
         }
     }
-
-    private fun updateAccessibilityStatus() {
-        val accessibilityStatus = findPreferenceNotNull<Preference>("accessibility_service_status")
-        val isEnabled = AccessibilityUtils.isAccessibilityServiceEnabled(
-            requireContext(),
-            AutoStartService::class.java
-        )
-        accessibilityStatus.summary = if (isEnabled) {
-            getString(R.string.accessibility_service_enabled)
-        } else {
-            getString(R.string.accessibility_service_disabled)
-        }
-    }
 }
diff --git a/app/src/main/java/io/github/dovecoteescapee/byedpi/receiver/BootReceiver.kt b/app/src/main/java/io/github/dovecoteescapee/byedpi/receiver/BootReceiver.kt
@@ -3,22 +3,31 @@ package io.github.dovecoteescapee.byedpi.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import io.github.dovecoteescapee.byedpi.services.AutoStartService
-import io.github.dovecoteescapee.byedpi.utility.AccessibilityUtils
+import android.net.VpnService
+import io.github.dovecoteescapee.byedpi.data.Mode
+import io.github.dovecoteescapee.byedpi.services.ServiceManager
+import io.github.dovecoteescapee.byedpi.utility.getPreferences
+import io.github.dovecoteescapee.byedpi.utility.mode
 
 class BootReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         if (intent.action == Intent.ACTION_BOOT_COMPLETED ||
+            intent.action == Intent.ACTION_REBOOT ||
             intent.action == "android.intent.action.QUICKBOOT_POWERON") {
 
-            val autorunEnabled = AccessibilityUtils.isAccessibilityServiceEnabled(
-                context,
-                AutoStartService::class.java
-            )
+            val preferences = context.getPreferences()
+            val autorunEnabled = preferences.getBoolean("autostart", false)
 
             if(autorunEnabled) {
-                val serviceIntent = Intent(context, AutoStartService::class.java)
-                context.startService(serviceIntent)
+                when (preferences.mode()) {
+                    Mode.VPN -> {
+                        if (VpnService.prepare(context) == null) {
+                            ServiceManager.start(context, Mode.VPN)
+                        }
+                    }
+
+                    Mode.Proxy -> ServiceManager.start(context, Mode.Proxy)
+                }
             }
         }
     }

diff --git a/app/src/main/java/io/github/dovecoteescapee/byedpi/services/AutoStartService.kt b/app/src/main/java/io/github/dovecoteescapee/byedpi/services/AutoStartService.kt
diff --git a/app/src/main/java/io/github/dovecoteescapee/byedpi/utility/AccessibilityUtils.kt b/app/src/main/java/io/github/dovecoteescapee/byedpi/utility/AccessibilityUtils.kt
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
@@ -75,7 +75,7 @@
     <string name="byedpi_protocols_category">Protocols</string>
     <string name="byedpi_protocols_hint">Uncheck all to desync all traffic</string>
     <string name="automation">Automation</string>
-    <string name="accessibility_service_description">Autostart service on device startup</string>
+    <string name="autostart_settings">Autostart service on device startup</string>
     <string name="autohide_settings">Automatically hide application after autostart</string>
     <string name="autoconnect_settings">Automatically connect when the application starts</string>
     <string name="accessibility_service_status">Autostart status</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -75,7 +75,7 @@
     <string name="byedpi_protocols_category">Протоколы</string>
     <string name="byedpi_protocols_hint">Снимите все галочки, чтобы десинхронизировать весь трафик</string>
     <string name="automation">Автоматизация</string>
-    <string name="accessibility_service_description">Автозапуск приложения при включении устройства</string>
+    <string name="autostart_settings">Автозапуск приложения при включении устройства</string>
     <string name="autohide_settings">Автоматически скрывать приложение после автозапуска</string>
     <string name="autoconnect_settings">Автоматическое подключение при открытии приложения</string>
     <string name="accessibility_service_status">Статус автозапуска</string>

diff --git a/app/src/main/res/xml/accessibility_service_config.xml b/app/src/main/res/xml/accessibility_service_config.xml
diff --git a/app/src/main/res/xml/main_settings.xml b/app/src/main/res/xml/main_settings.xml
@@ -60,9 +60,10 @@
     <androidx.preference.PreferenceCategory
         android:title="@string/automation">
 
-        <Preference
-            android:key="accessibility_service_status"
-            android:title="@string/accessibility_service_status" />
+        <SwitchPreference
+            android:key="autostart"
+            android:title="@string/autostart_settings"
+            android:defaultValue="false" />
 
         <SwitchPreference
             android:key="auto_connect"