Fix a bug while deleting notes from CardView;Update create_release.yml

0Kirby · Nov 17, 2020 · fbf1272 · fbf1272
1 parent c2fd683
commit fbf1272
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Assemble release with Gradle
         run: chmod +x gradlew &&./gradlew assembleRelease
       - name: Find filename and set env
-        run: echo ::set-env name=FILENAME::`basename app/build/outputs/apk/release/*.apk`
+        run: echo "FILENAME=`basename app/build/outputs/apk/release/*.apk`" >> $GITHUB_ENV
       - name: Sign APK
         run: jarsigner -verbose -keystore jtykey.jks -storepass ${{ secrets.STORE_PASS }} app/build/outputs/apk/release/${{ env.FILENAME }} zerokirby
       - name: Create Release

diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode Integer.valueOf(getDate())
-        versionName "2.14.4"
+        versionName "2.14.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/cn/zerokirby/note/noteutil/NoteAdapter.java b/app/src/main/java/cn/zerokirby/note/noteutil/NoteAdapter.java
@@ -102,9 +102,7 @@ public void onClick(DialogInterface dialogInterface, int i) {//点击确定则
                         NoteDataHelper noteDataHelper = new NoteDataHelper();
                         noteDataHelper.deleteNote(id);
                         noteDataHelper.close();
-
                         mainActivity.modifySync();
-                        mainActivity.deleteNoteById(id);
                     }
                 });
                 builder.setNegativeButton("取消", new DialogInterface.OnClickListener() {//什么也不做

diff --git a/app/src/main/java/cn/zerokirby/note/noteutil/NoteAdapterSpecial.java b/app/src/main/java/cn/zerokirby/note/noteutil/NoteAdapterSpecial.java
@@ -190,9 +190,7 @@ public void onClick(DialogInterface dialogInterface, int i) {//点击确定则
                         NoteDataHelper noteDataHelper = new NoteDataHelper();
                         noteDataHelper.deleteNote(id);
                         noteDataHelper.close();
-
                         mainActivity.modifySync();
-                        mainActivity.deleteNoteById(id);
                     }
                 });
                 builder.setNegativeButton("取消", new DialogInterface.OnClickListener() {//什么也不做