diff --git a/app/build.gradle b/app/build.gradle index 51aef35..79c5360 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "net.kaaass.zerotierfix" minSdkVersion 21 targetSdkVersion 30 - versionCode 4 - versionName "1.0.1" + versionCode 5 + versionName "1.0.2-alpha" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } diff --git a/app/src/main/java/net/kaaass/zerotierfix/ui/MoonOrbitFragment.java b/app/src/main/java/net/kaaass/zerotierfix/ui/MoonOrbitFragment.java index 554d998..d1d14b4 100644 --- a/app/src/main/java/net/kaaass/zerotierfix/ui/MoonOrbitFragment.java +++ b/app/src/main/java/net/kaaass/zerotierfix/ui/MoonOrbitFragment.java @@ -299,8 +299,7 @@ public void onAddMoonOrbitEvent(AddMoonOrbitEvent event) { // 数据库修改 DaoSession daoSession = ((AnalyticsApplication) getActivity().getApplication()).getDaoSession(); long existCount = daoSession.getMoonOrbitDao().queryBuilder() - .where(MoonOrbitDao.Properties.MoonWorldId.eq(moonWorldId), - MoonOrbitDao.Properties.MoonSeed.eq(moonSeed)) + .where(MoonOrbitDao.Properties.MoonWorldId.eq(moonWorldId)) .buildCount() .count(); if (existCount > 0) { @@ -441,6 +440,7 @@ public boolean onLongClick(View view) { // 删除缓存文件 this.mItem.deleteCacheFile(getContext()); this.mMoonConfig.setText(R.string.wait_to_fetch); + Snackbar.make(getView(), R.string.cached_moon_file_delete, BaseTransientBottomBar.LENGTH_SHORT).show(); return true; } return false; diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 23e7b4f..1f8778a 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -127,4 +127,5 @@ 已缓存 Moon 文件格式错误 Moon 结点的 Zerotier 地址。即 Moon 文件的文件名(不包含扩展名)。 + 已删除缓存的 Moon 文件。需手动重连使配置生效。 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fc1127e..868bebf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -130,4 +130,5 @@ Cached Wrong moon file format Zerotier address of Moon node. Also filename of its moon file. + Cached moon file deleted. Reconnect for this setting to take effect.