适配安卓4.3

miaozilong · Mar 1, 2022 · b2fab95 · b2fab95
1 parent 917df0f
commit b2fab95
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 21 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
     compileSdkVersion 30
     defaultConfig {
         applicationId "com.ester.remotetrigger"
-        minSdkVersion 29
+        minSdkVersion 18
         targetSdkVersion 30
         versionCode 1
         versionName "1.0"
@@ -47,6 +47,6 @@ dependencies {
     implementation "com.squareup.retrofit2:converter-gson:2.3.0"
     implementation 'io.reactivex:rxandroid:1.2.1'
 
-    implementation 'com.sun.mail:android-mail:1.6.2'
-    implementation 'com.sun.mail:android-activation:1.6.2'
+    implementation 'com.sun.mail:android-mail:1.5.5'
+    implementation 'com.sun.mail:android-activation:1.5.5'
 }
diff --git a/app/src/main/java/com/ester/remotetrigger/activity/MainActivity.kt b/app/src/main/java/com/ester/remotetrigger/activity/MainActivity.kt
@@ -59,7 +59,11 @@ class MainActivity : AppCompatActivity() {
 
                 btStop.text = "启动服务"
             } else {
-                startForegroundService(startServiceIntent)
+                // 18   26
+//                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+//                    startForegroundService(startServiceIntent)
+//                }
+                startService(Intent(this, ForwardSMSService::class.java))
                 trigger_text.text = "事件监听中……"
 
                 btStop.text = "停止服务"
@@ -89,7 +93,9 @@ class MainActivity : AppCompatActivity() {
         }
 
         if (needPermissions) {
-            requestPermissions(permissions, REQUEST_CODE)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                requestPermissions(permissions, REQUEST_CODE)
+            }
         }
     }
 

diff --git a/app/src/main/java/com/ester/remotetrigger/service/ForwardService.kt b/app/src/main/java/com/ester/remotetrigger/service/ForwardService.kt
@@ -28,7 +28,7 @@ class ForwardService(context: Context) {
         this.context = context
     }
 
-    fun Send(text:String, desp:String) {
+    fun Send(text: String, desp: String) {
         val sp = PreferenceManager.getDefaultSharedPreferences(context)
 
         if (sp.getBoolean("send.ftqq", false)) {
@@ -54,7 +54,7 @@ class ForwardService(context: Context) {
         }
     }
 
-    fun SendEmail(text:String, desp:String, sp:SharedPreferences) {
+    fun SendEmail(text: String, desp: String, sp: SharedPreferences) {
         Log.d(LOG_TAG, "Notify send email")
 
         Thread {
@@ -64,31 +64,31 @@ class ForwardService(context: Context) {
 
             val session: Session = Session.getInstance(properties)
             val message: Message = MimeMessage(session)
-            val me:String? = sp.getString("settings.smtp_user", "")
-            val to:String? = sp.getString("settings.smtp_receive", "")
-            val host:String? = sp.getString("settings.smtp_host", "")
-            val user:String? = sp.getString("settings.smtp_user", "")
-            val pwd:String? = sp.getString("settings.smtp_pwd", "")
+            val me: String? = sp.getString("settings.smtp_user", "")
+            val to: String? = sp.getString("settings.smtp_receive", "")
+            val host: String? = sp.getString("settings.smtp_host", "")
+            val user: String? = sp.getString("settings.smtp_user", "")
+            val pwd: String? = sp.getString("settings.smtp_pwd", "")
 
-            message.subject = "$text【转发提醒】"
+            message.subject = "$text"
             message.setText(desp)
             message.setFrom(InternetAddress(me))
             message.addRecipients(Message.RecipientType.TO, arrayOf<Address>(InternetAddress(to)))
             message.saveChanges()
 
             val transport: Transport = session.getTransport()
             transport.connect(
-                    host,
-                    25,
-                    user,
-                    pwd)
+                host,
+                587,
+                user,
+                pwd
+            )
             transport.sendMessage(message, message.allRecipients)
-
             transport.close()
         }.start()
     }
 
-    fun SendFTQQ(text:String, desp:String, sp:SharedPreferences) {
+    fun SendFTQQ(text: String, desp: String, sp: SharedPreferences) {
         Log.d(LOG_TAG, "Notify send ftqq")
 
         val apiService = FTQQApiService.create()
@@ -107,7 +107,7 @@ class ForwardService(context: Context) {
         })
     }
 
-    fun SendBark(text:String, desp:String, sp:SharedPreferences) {
+    fun SendBark(text: String, desp: String, sp: SharedPreferences) {
         Log.d(LOG_TAG, "Notify send bark")
 
         val apiService = BarkApiService.create()
@@ -116,7 +116,10 @@ class ForwardService(context: Context) {
         if (key != null) {
             val call = apiService.sendNotify(key, text, desp)
             call.enqueue(object : Callback<BarkNotifyResult> {
-                override fun onResponse(call: Call<BarkNotifyResult>?, response: Response<BarkNotifyResult>?) {
+                override fun onResponse(
+                    call: Call<BarkNotifyResult>?,
+                    response: Response<BarkNotifyResult>?
+                ) {
                     if (response?.code() == 200) {
                         Log.d(LOG_TAG, "Tel Bark Notify sent ${response.body()?.code}")
                     } else {

diff --git a/app/src/test/java/com/ester/remotetrigger/ExampleUnitTest.kt b/app/src/test/java/com/ester/remotetrigger/ExampleUnitTest.kt
@@ -1,5 +1,6 @@
 package com.ester.remotetrigger
 
+import com.ester.remotetrigger.service.ForwardService
 import org.junit.Test
 
 import org.junit.Assert.*