fix crash by obfs

This commit is contained in:
Kr328 committed 2019-12-07 07:10:13 +08:00
1 parent 53fa597556
commit 21fb12ef71
6 files changed
+11 -3

No files matched your search

+2 -2
View File
@@ -11,8 +11,8 @@ android {
applicationId "com.github.kr328.clash"
minSdkVersion 24
targetSdkVersion 29
versionCode 1
versionName "1.0"
versionCode 10001
versionName "1.0.1-alpha"
}
buildTypes {
release {
@@ -1,10 +1,12 @@
package com.github.kr328.clash
import android.os.Bundle
import androidx.annotation.Keep
import androidx.preference.PreferenceFragmentCompat
import kotlinx.android.synthetic.main.activity_feedback.*
class FeedbackActivity : BaseActivity() {
@Keep
class Fragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.feedback, rootKey)
@@ -4,6 +4,7 @@ import android.content.ComponentName
import android.content.Context
import android.content.pm.PackageManager
import android.os.Bundle
import androidx.annotation.Keep
import androidx.preference.CheckBoxPreference
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
@@ -16,6 +17,7 @@ class SettingApplicationActivity : BaseActivity() {
const val KEY_START_ON_BOOT = "key_application_start_on_boot"
}
@Keep
class Fragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.setting_application, rootKey)
@@ -1,10 +1,12 @@
package com.github.kr328.clash
import android.os.Bundle
import androidx.annotation.Keep
import androidx.preference.PreferenceFragmentCompat
import kotlinx.android.synthetic.main.activity_setting_main.*
class SettingMainActivity : BaseActivity() {
@Keep
class Fragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.setting_main, rootKey)
@@ -3,6 +3,7 @@ package com.github.kr328.clash
import android.content.Context
import android.os.Bundle
import android.view.View
import androidx.annotation.Keep
import androidx.core.content.edit
import androidx.preference.CheckBoxPreference
import androidx.preference.PreferenceFragmentCompat
@@ -14,6 +15,7 @@ class SettingProxyActivity : BaseActivity() {
private const val KEY_IPV6_SUPPORT = "key_vpn_setting_ipv6_support"
}
@Keep
class Fragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.setting_proxy, rootKey)
@@ -14,7 +14,7 @@ import java.util.*
class LogAdapter(private val content: Context,
private val buffer: CircularArray<LogEvent>) : RecyclerView.Adapter<LogAdapter.Holder>() {
private val formatter = SimpleDateFormat("hh:MM:ss", Locale.getDefault())
private val formatter = SimpleDateFormat("HH:mm:ss", Locale.getDefault())
class Holder(view: View) : RecyclerView.ViewHolder(view) {
val type: TextView = view.findViewById(R.id.adapter_log_type)