From a31f864ab80062feb041ebeb191ea910a9056315 Mon Sep 17 00:00:00 2001 From: Kr328 <39107975+Kr328@users.noreply.github.com> Date: Tue, 17 Dec 2019 14:25:11 +0800 Subject: [PATCH] fix bugs --- app/build.gradle | 4 ++-- .../main/java/com/github/kr328/clash/ImportFileActivity.kt | 3 ++- app/src/main/java/com/github/kr328/clash/ImportUrlActivity.kt | 3 ++- app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d3db07e..204b135 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "com.github.kr328.clash" minSdkVersion 24 targetSdkVersion 29 - versionCode 10020 - versionName "1.0.20-alpha" + versionCode 10021 + versionName "1.0.21-alpha" } buildTypes { release { diff --git a/app/src/main/java/com/github/kr328/clash/ImportFileActivity.kt b/app/src/main/java/com/github/kr328/clash/ImportFileActivity.kt index b4cbfc7..9948e40 100644 --- a/app/src/main/java/com/github/kr328/clash/ImportFileActivity.kt +++ b/app/src/main/java/com/github/kr328/clash/ImportFileActivity.kt @@ -104,12 +104,13 @@ class ImportFileActivity : BaseActivity() { FileOutputStream(pipe[1].fileDescriptor).use { it.write(data.toByteArray()) } + + pipe[1].close() } val error = it.checkProfileValid(pipe[0]) pipe[0].close() - pipe[1].close() if (error != null) throw Exception(error) diff --git a/app/src/main/java/com/github/kr328/clash/ImportUrlActivity.kt b/app/src/main/java/com/github/kr328/clash/ImportUrlActivity.kt index c1647c6..da238ff 100644 --- a/app/src/main/java/com/github/kr328/clash/ImportUrlActivity.kt +++ b/app/src/main/java/com/github/kr328/clash/ImportUrlActivity.kt @@ -109,12 +109,13 @@ class ImportUrlActivity : BaseActivity() { FileOutputStream(pipe[1].fileDescriptor).use { it.write(data.toByteArray()) } + + pipe[1].close() } val error = it.checkProfileValid(pipe[0]) pipe[0].close() - pipe[1].close() if ( error != null ) throw Exception(error) diff --git a/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt b/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt index 917593c..91ec84d 100644 --- a/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt +++ b/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt @@ -165,12 +165,12 @@ class ProfilesActivity : BaseActivity() { FileOutputStream(pipe[1].fileDescriptor).use { it.write(data.toByteArray()) } + pipe[1].close() } val error = it.checkProfileValid(pipe[0]) pipe[0].close() - pipe[1].close() if ( error != null ) throw Exception(error)