Merge pull request #108 from Arctosoft/develop

Version 2.1.1
Arctosoft · Dec 19, 2024 · 8cf5b61 · 8cf5b61
2 parents 0634eda + 746bb4a
commit 8cf5b61
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -2,12 +2,13 @@
 An encrypted gallery vault for Android devices.
 
 ## Features
-- Supports images, GIFs and videos
+- Supports images, GIFs, videos and text files
 - Organise using folders
 - The app requires no permissions
 - Encrypted files are stored on-disk allowing for easy backups and transfers between devices
 - Supports multiple vaults by the use of different passwords
 - Day/night modes
+- Add notes/text to files
 
 ## Encryption
 Files are encrypted using ChaCha20 and keys are derived using PBKDF2 with HMAC-SHA512. Read the details in [ENCRYPTION.md](ENCRYPTION.md).

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
         applicationId = "se.arctosoft.vault"
         minSdk = 28
         targetSdk = 35
-        versionCode = 33
-        versionName = "2.1.0"
+        versionCode = 34
+        versionName = "2.1.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
@@ -415,7 +415,7 @@ private void loadImage(Uri uri, GalleryPagerViewHolder holder, FragmentActivity
             ((GalleryPagerViewHolder.GalleryPagerImageViewHolder) holder).binding.imageView.setImage(ImageSource.uri(uri, password.getPassword(), version));
         } else if (holder instanceof GalleryPagerViewHolder.GalleryPagerGifViewHolder) {
             Glide.with(context)
-                    .asGif()
+                    //.asGif()
                     .load(uri)
                     .apply(GlideStuff.getRequestOptions(useDiskCache))
                     .into(((GalleryPagerViewHolder.GalleryPagerGifViewHolder) holder).binding.gifImageView);

diff --git a/app/src/main/java/se/arctosoft/vault/loader/CipherDataFetcher.java b/app/src/main/java/se/arctosoft/vault/loader/CipherDataFetcher.java
@@ -33,6 +33,7 @@
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
 
+import se.arctosoft.vault.data.FileType;
 import se.arctosoft.vault.data.Password;
 import se.arctosoft.vault.encryption.Encryption;
 import se.arctosoft.vault.exception.InvalidPasswordException;
@@ -56,7 +57,12 @@ public CipherDataFetcher(@NonNull Context context, Uri uri, int version) {
     public void loadData(@NonNull Priority priority, @NonNull DataCallback<? super InputStream> callback) {
         try {
             InputStream inputStream = context.getContentResolver().openInputStream(uri);
-            streams = Encryption.getCipherInputStream(inputStream, password.getPassword(), true, version);
+            streams = Encryption.getCipherInputStream(
+                    inputStream,
+                    password.getPassword(),
+                    version > 1 || !uri.getLastPathSegment().contains(FileType.GIF_V1.suffixPrefix), // don't load as thumb for GIF file
+                    version
+            );
             callback.onDataReady(streams.getInputStream());
         } catch (GeneralSecurityException | IOException | InvalidPasswordException |
                  JSONException e) {

diff --git a/fastlane/metadata/android/en-US/changelogs/34.txt b/fastlane/metadata/android/en-US/changelogs/34.txt
@@ -0,0 +1,4 @@
+* Added option to check "Delete after importing" by default
+* Fixed missing fullscreen button
+* Fixed text padding
+* Fixed GIFs not playing
diff --git a/fastlane/metadata/android/sv-SE/changelogs/34.txt b/fastlane/metadata/android/sv-SE/changelogs/34.txt
@@ -0,0 +1,4 @@
+* Tillagt alternativ för att markera "Delete after importing" som standard
+* Fixat saknad helskärmsknapp
+* Fixat textutfyllnad
+* Fixat GIF-filer laddas ej