Skip to content

Commit 090bf14

Browse files
committed
Update to API 29
1 parent 3daf980 commit 090bf14

File tree

6 files changed

+11
-15
lines changed

6 files changed

+11
-15
lines changed

app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ def getCurrentFlavor() {
1818
}
1919

2020
android {
21-
compileSdkVersion 28
21+
compileSdkVersion 29
2222
defaultConfig {
2323
applicationId "com.github.shadowsocks.plugin.v2ray"
2424
minSdkVersion rootProject.minSdkVersion
25-
targetSdkVersion 28
25+
targetSdkVersion 29
2626
versionCode 1020000
2727
versionName "1.2.0"
2828
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -64,7 +64,7 @@ tasks.whenTaskAdded { task ->
6464
dependencies {
6565
implementation fileTree(dir: 'libs', include: ['*.jar'])
6666
implementation "androidx.preference:preference:1.1.0-beta01"
67-
implementation 'com.github.shadowsocks:plugin:1.2.0'
67+
implementation 'com.github.shadowsocks:plugin:1.3.0'
6868
implementation 'com.takisoft.preferencex:preferencex-simplemenu:1.0.0'
6969
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
7070
testImplementation 'junit:junit:4.12'

app/src/main/java/com/github/shadowsocks/plugin/v2ray/BinaryProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class BinaryProvider : NativePluginProvider() {
3232
provider.addPath("v2ray", 0b111101101)
3333
}
3434
override fun getExecutable() = context!!.applicationInfo.nativeLibraryDir + "/libv2ray.so"
35-
override fun openFile(uri: Uri?): ParcelFileDescriptor = when (uri?.path) {
35+
override fun openFile(uri: Uri): ParcelFileDescriptor = when (uri.path) {
3636
"/v2ray" -> ParcelFileDescriptor.open(File(getExecutable()), ParcelFileDescriptor.MODE_READ_ONLY)
3737
else -> throw FileNotFoundException()
3838
}

app/src/main/java/com/github/shadowsocks/plugin/v2ray/CertificatePreferenceDialogFragment.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ package com.github.shadowsocks.plugin.v2ray
2222

2323
import android.content.ActivityNotFoundException
2424
import android.content.Intent
25-
import android.view.View
2625
import androidx.appcompat.app.AlertDialog
2726
import androidx.core.os.bundleOf
2827
import androidx.preference.EditTextPreferenceDialogFragmentCompat
@@ -35,7 +34,7 @@ class CertificatePreferenceDialogFragment : EditTextPreferenceDialogFragmentComp
3534

3635
override fun onPrepareDialogBuilder(builder: AlertDialog.Builder) {
3736
super.onPrepareDialogBuilder(builder)
38-
builder.setNeutralButton("Browse…") { _, _ ->
37+
builder.setNeutralButton(R.string.browse) { _, _ ->
3938
val activity = requireActivity()
4039
try {
4140
targetFragment!!.startActivityForResult(Intent(Intent.ACTION_GET_CONTENT).apply {
@@ -44,9 +43,8 @@ class CertificatePreferenceDialogFragment : EditTextPreferenceDialogFragmentComp
4443
}, ConfigFragment.REQUEST_BROWSE_CERTIFICATE)
4544
return@setNeutralButton
4645
} catch (_: ActivityNotFoundException) { } catch (_: SecurityException) { }
47-
Snackbar.make(activity.findViewById<View>(R.id.content),
48-
"Please install a file manager like MiXplorer",
49-
Snackbar.LENGTH_SHORT).show()
46+
Snackbar.make(activity.findViewById(R.id.content), R.string.file_manager_missing, Snackbar.LENGTH_SHORT)
47+
.show()
5048
}
5149
}
5250
}

app/src/main/java/com/github/shadowsocks/plugin/v2ray/ConfigFragment.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,12 @@ import android.content.Intent
2525
import android.os.Bundle
2626
import android.text.InputFilter
2727
import android.text.InputType
28-
import android.view.View
2928
import androidx.preference.EditTextPreference
3029
import androidx.preference.ListPreference
3130
import androidx.preference.Preference
3231
import androidx.preference.PreferenceFragmentCompat
3332
import com.github.shadowsocks.plugin.PluginOptions
3433
import com.google.android.material.snackbar.Snackbar
35-
import java.lang.RuntimeException
3634

3735
class ConfigFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener {
3836
companion object {
@@ -116,8 +114,8 @@ class ConfigFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChange
116114
certRaw.text = activity.contentResolver.openInputStream(data!!.data!!)!!
117115
.bufferedReader().readText()
118116
} catch (e: RuntimeException) {
119-
Snackbar.make(activity.findViewById<View>(R.id.content), e.localizedMessage, Snackbar.LENGTH_LONG)
120-
.show()
117+
Snackbar.make(activity.findViewById(R.id.content), e.localizedMessage ?: e.javaClass.name,
118+
Snackbar.LENGTH_LONG).show()
121119
}
122120
}
123121
else -> super.onActivityResult(requestCode, resultCode, data)

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'com.github.ben-manes.versions'
44

55
buildscript {
66
ext {
7-
kotlinVersion = '1.3.31'
7+
kotlinVersion = '1.3.40'
88
minSdkVersion = 21
99
}
1010
repositories {

0 commit comments

Comments
 (0)