Merge pull request #37 from Arctosoft/develop

Read note with UTF-8, updated version
Arctosoft · Jan 15, 2024 · 83d7629 · 83d7629
2 parents 426e1bb + 5cfb810
commit 83d7629
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "se.arctosoft.vault"
         minSdk 28
         targetSdk 34
-        versionCode 17
-        versionName "1.5.0"
+        versionCode 18
+        versionName "1.5.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/se/arctosoft/vault/adapters/GalleryPagerAdapter.java b/app/src/main/java/se/arctosoft/vault/adapters/GalleryPagerAdapter.java
@@ -431,7 +431,7 @@ private void loadNote(GalleryPagerViewHolder holder, FragmentActivity context, G
             } else {
                 holder.parentBinding.noteLayout.setVisibility(View.VISIBLE);
                 holder.parentBinding.note.setText(context.getString(R.string.gallery_loading_note));
-                new Thread(() -> Encryption.decryptToCache(context, galleryFile.getNoteUri(), settings.getTempPassword(), new Encryption.IOnUriResult() {
+                Encryption.decryptToCache(context, galleryFile.getNoteUri(), settings.getTempPassword(), new Encryption.IOnUriResult() {
                     @Override
                     public void onUriResult(Uri outputUri) { // decrypted, now read it
                         try {
@@ -456,7 +456,7 @@ public void onInvalidPassword(InvalidPasswordException e) {
                         galleryFile.setNote(context.getString(R.string.gallery_note_decrypt_failed, e.getMessage()));
                         context.runOnUiThread(() -> notifyItemChanged(holder.getBindingAdapterPosition(), new GalleryGridAdapter.Payload(GalleryGridAdapter.Payload.TYPE_LOADED_NOTE)));
                     }
-                })).start();
+                });
             }
         } else {
             holder.parentBinding.noteLayout.setVisibility(View.GONE);

diff --git a/app/src/main/java/se/arctosoft/vault/utils/FileStuff.java b/app/src/main/java/se/arctosoft/vault/utils/FileStuff.java
@@ -35,6 +35,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -169,11 +170,13 @@ public static String getNameWithoutPrefix(@NonNull String s) {
 
     public static String readTextFromUri(@NonNull Uri uri, Context context) throws IOException {
         InputStream in = context.getContentResolver().openInputStream(uri);
-        BufferedReader br = new BufferedReader(new InputStreamReader(in));
+        BufferedReader br = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
+
         StringBuilder sb = new StringBuilder();
-        String s;
-        while ((s = br.readLine()) != null) {
-            sb.append(s);
+        int read;
+        char[] buffer = new char[8192];
+        while ((read = br.read(buffer)) != -1) {
+            sb.append(buffer, 0, read);
         }
 
         return sb.toString();

diff --git a/fastlane/metadata/android/en-US/changelogs/18.txt b/fastlane/metadata/android/en-US/changelogs/18.txt
@@ -0,0 +1,3 @@
+* Add notes (text) to files
+* Files are exported into the directory where the encrypted file is instead of the topmost directory (bug fix)
+* Files are exported with the original name instead of the encrypted name
diff --git a/fastlane/metadata/android/sv-SE/changelogs/18.txt b/fastlane/metadata/android/sv-SE/changelogs/18.txt
@@ -0,0 +1,3 @@
+* Lägg till anteckningar/text till filer
+* Filer exporteras nu till samma mapp där den krypterade filen ligger istället för den översta mappen (buggfix)
+* Filer exporteras nu med originalnamnet istället för det krypterade filnamnet