owncloud · JuancaG05 · Oct 19, 2023 · Sep 25, 2023 · Sep 27, 2023 · Sep 28, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,34 @@
+Changelog for ownCloud Android Client [4.1.1] (2023-10-18)
+=======================================
+The following sections list the changes in ownCloud Android Client 4.1.1 relevant to
+ownCloud admins and users.
+
+[4.1.1]: https://github.com/owncloud/android/compare/v4.1.0...v4.1.1
+
+Summary
+-------
+
+* Bugfix - Some Null Pointer Exceptions avoided: [#4158](https://github.com/owncloud/android/issues/4158)
+* Bugfix - Thumbnails correctly shown for every user: [#4189](https://github.com/owncloud/android/pull/4189)
+
+Details
+-------
+
+* Bugfix - Some Null Pointer Exceptions avoided: [#4158](https://github.com/owncloud/android/issues/4158)
+
+   In the detail screen, in the main file list ViewModel and in the OCFile repository the app has
+   been prevented from crashing when a null is found.
+
+   https://github.com/owncloud/android/issues/4158
+   https://github.com/owncloud/android/pull/4170
+
+* Bugfix - Thumbnails correctly shown for every user: [#4189](https://github.com/owncloud/android/pull/4189)
+
+   Due to an error in the request, users that included the '@' character in their usernames
+   couldn't see the thumbnails of the image files. Now, every user can see them correctly.
+
+   https://github.com/owncloud/android/pull/4189
+
 Changelog for ownCloud Android Client [4.1.0] (2023-08-23)
 =======================================
 The following sections list the changes in ownCloud Android Client 4.1.0 relevant to

diff --git a/changelog/4.1.1_2023-10-18/4170 b/changelog/4.1.1_2023-10-18/4170
@@ -0,0 +1,6 @@
+Bugfix: Some Null Pointer Exceptions avoided
+
+in the detail screen, in the main file list ViewModel and in the OCFile repository the app has been prevented from crashing when a null is found.
+
+https://github.com/owncloud/android/issues/4158
+https://github.com/owncloud/android/pull/4170
diff --git a/changelog/4.1.1_2023-10-18/4189 b/changelog/4.1.1_2023-10-18/4189
@@ -0,0 +1,6 @@
+Bugfix: Thumbnails correctly shown for every user
+
+Due to an error in the request, users that included the '@' character in their usernames couldn't
+see the thumbnails of the image files. Now, every user can see them correctly.
+
+https://github.com/owncloud/android/pull/4189
diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle
@@ -92,8 +92,8 @@ android {
 
         testInstrumentationRunner "com.owncloud.android.utils.OCTestAndroidJUnitRunner"
 
-        versionCode = 41000000
-        versionName = "4.1.0"
+        versionCode = 41000100
+        versionName = "4.1.1"
 
         buildConfigField "String", gitRemote, "\"" + getGitOriginRemote() + "\""
         buildConfigField "String", commitSHA1, "\"" + getLatestGitHash() + "\""
@@ -160,6 +160,11 @@ android {
     }
 
     testOptions {
+        packagingOptions {
+            jniLibs {
+                useLegacyPackaging = true
+            }
+        }
         unitTests.returnDefaultValues = true
         animationsDisabled = true
     }

diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/utils/ReleaseNotesList.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/utils/ReleaseNotesList.kt
@@ -25,38 +25,18 @@ import com.owncloud.android.presentation.releasenotes.ReleaseNoteType
 
 val releaseNotesList = listOf(
     ReleaseNote(
-        title = R.string.release_notes_4_1_title_1,
-        subtitle = R.string.release_notes_4_1_subtitle_1,
-        type = ReleaseNoteType.ENHANCEMENT,
+        title = R.string.release_notes_header,
+        subtitle = R.string.release_notes_footer,
+        type = ReleaseNoteType.BUGFIX
     ),
     ReleaseNote(
-        title = R.string.release_notes_4_1_title_2,
-        subtitle = R.string.release_notes_4_1_subtitle_2,
-        type = ReleaseNoteType.ENHANCEMENT,
+        title = R.string.release_notes_header,
+        subtitle = R.string.release_notes_footer,
+        type = ReleaseNoteType.BUGFIX
     ),
     ReleaseNote(
-        title = R.string.release_notes_4_1_title_3,
-        subtitle = R.string.release_notes_4_1_subtitle_3,
-        type = ReleaseNoteType.ENHANCEMENT,
-    ),
-    ReleaseNote(
-        title = R.string.release_notes_4_1_title_4,
-        subtitle = R.string.release_notes_4_1_subtitle_4,
-        type = ReleaseNoteType.BUGFIX,
-    ),
-    ReleaseNote(
-        title = R.string.release_notes_4_1_title_5,
-        subtitle = R.string.release_notes_4_1_subtitle_5,
-        type = ReleaseNoteType.ENHANCEMENT,
-    ),
-    ReleaseNote(
-        title = R.string.release_notes_4_1_title_6,
-        subtitle = R.string.release_notes_4_1_subtitle_6,
-        type = ReleaseNoteType.ENHANCEMENT,
-    ),
-    ReleaseNote(
-        title = R.string.release_notes_4_1_title_7,
-        subtitle = R.string.release_notes_4_1_subtitle_7,
-        type = ReleaseNoteType.BUGFIX,
-    ),
+        title = R.string.release_notes_header,
+        subtitle = R.string.release_notes_footer,
+        type = ReleaseNoteType.ENHANCEMENT
+    )
 )
diff --git a/owncloudApp/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/owncloudApp/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -44,6 +44,7 @@
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.SingleSessionManager;
+import com.owncloud.android.lib.common.accounts.AccountUtils;
 import com.owncloud.android.lib.common.http.HttpConstants;
 import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod;
 import com.owncloud.android.ui.adapter.DiskLruImageCache;
@@ -259,7 +260,7 @@ private int getThumbnailDimension() {
         }
 
         private String getPreviewUrl(OCFile ocFile, Account account) {
-            String baseUrl = mClient.getBaseUri() + "/remote.php/dav/files/" + account.name.split("@")[0];
+            String baseUrl = mClient.getBaseUri() + "/remote.php/dav/files/" + AccountUtils.getUserId(account, MainApp.Companion.getAppContext());
 
             if (ocFile.getSpaceId() != null) {
                 Lazy<GetWebDavUrlForSpaceUseCase> getWebDavUrlForSpaceUseCaseLazy = inject(GetWebDavUrlForSpaceUseCase.class);

diff --git a/...dApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt b/...dApp/src/main/java/com/owncloud/android/presentation/files/details/FileDetailsFragment.kt
@@ -309,23 +309,23 @@ class FileDetailsFragment : FileFragment() {
     }
 
     private fun setLastSync(ocFile: OCFile) {
-        if (ocFile.lastSyncDateForData!! > ZERO_MILLISECOND_TIME) {
+        if (ocFile.lastSyncDateForData?.let { it > ZERO_MILLISECOND_TIME } == true) {
             binding.fdLastSync.visibility = View.VISIBLE
             binding.fdLastSyncLabel.visibility = View.VISIBLE
             binding.fdLastSync.text = DisplayUtils.unixTimeToHumanReadable(ocFile.lastSyncDateForData!!)
         }
     }
 
     private fun setModified(ocFile: OCFile) {
-        if (ocFile.modificationTimestamp!! > ZERO_MILLISECOND_TIME) {
+        if (ocFile.modificationTimestamp?.let { it > ZERO_MILLISECOND_TIME } == true) {
             binding.fdModified.visibility = View.VISIBLE
             binding.fdModifiedLabel.visibility = View.VISIBLE
-            binding.fdModified.text = DisplayUtils.unixTimeToHumanReadable(ocFile.modificationTimestamp!!)
+            binding.fdModified.text = DisplayUtils.unixTimeToHumanReadable(ocFile.modificationTimestamp)
         }
     }
 
     private fun setCreated(ocFile: OCFile) {
-        if (ocFile.creationTimestamp!! > ZERO_MILLISECOND_TIME) {
+        if (ocFile.creationTimestamp?.let { it > ZERO_MILLISECOND_TIME } == true) {
             binding.fdCreated.visibility = View.VISIBLE
             binding.fdCreatedLabel.visibility = View.VISIBLE
             binding.fdCreated.text = DisplayUtils.unixTimeToHumanReadable(ocFile.creationTimestamp!!)

diff --git a/...p/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListViewModel.kt b/...p/src/main/java/com/owncloud/android/presentation/files/filelist/MainFileListViewModel.kt
@@ -256,7 +256,7 @@ class MainFileListViewModel(
                 TODO()
             }
 
-            updateFolderToDisplay(parentDir!!)
+            parentDir?.let { updateFolderToDisplay(it) }
         }
     }
 

diff --git a/...App/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt b/...App/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt
@@ -46,43 +46,13 @@ class ReleaseNotesViewModel(
     companion object {
         val releaseNotesList = listOf(
             ReleaseNote(
-                title = R.string.release_notes_4_1_title_1,
-                subtitle = R.string.release_notes_4_1_subtitle_1,
-                type = ReleaseNoteType.ENHANCEMENT,
-            ),
-            ReleaseNote(
-                title = R.string.release_notes_4_1_title_2,
-                subtitle = R.string.release_notes_4_1_subtitle_2,
-                type = ReleaseNoteType.ENHANCEMENT,
-            ),
-            ReleaseNote(
-                title = R.string.release_notes_4_1_title_3,
-                subtitle = R.string.release_notes_4_1_subtitle_3,
-                type = ReleaseNoteType.ENHANCEMENT,
-            ),
-            ReleaseNote(
-                title = R.string.release_notes_4_1_title_4,
-                subtitle = R.string.release_notes_4_1_subtitle_4,
+                title = R.string.release_notes_4_1_1_title_1,
+                subtitle = R.string.release_notes_4_1_1_subtitle_1,
                 type = ReleaseNoteType.BUGFIX,
             ),
             ReleaseNote(
-                title = R.string.release_notes_4_1_title_5,
-                subtitle = R.string.release_notes_4_1_subtitle_5,
-                type = ReleaseNoteType.ENHANCEMENT,
-            ),
-            ReleaseNote(
-                title = R.string.release_notes_4_1_title_6,
-                subtitle = R.string.release_notes_4_1_subtitle_6,
-                type = ReleaseNoteType.ENHANCEMENT,
-            ),
-            ReleaseNote(
-                title = R.string.release_notes_4_1_title_8,
-                subtitle = R.string.release_notes_4_1_subtitle_8,
-                type = ReleaseNoteType.CHANGE,
-            ),
-            ReleaseNote(
-                title = R.string.release_notes_4_1_title_7,
-                subtitle = R.string.release_notes_4_1_subtitle_7,
+                title = R.string.release_notes_4_1_1_title_2,
+                subtitle = R.string.release_notes_4_1_1_subtitle_2,
                 type = ReleaseNoteType.BUGFIX,
             ),
         )

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/DiskLruImageCache.java b/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/DiskLruImageCache.java
@@ -31,15 +31,14 @@
 import android.graphics.BitmapFactory;
 
 import com.jakewharton.disklrucache.DiskLruCache;
-import com.owncloud.android.MainApp;
 import timber.log.Timber;
 
 public class DiskLruImageCache {
 
     private final DiskLruCache mDiskCache;
     private final CompressFormat mCompressFormat;
     private final int mCompressQuality;
-    private static final int CACHE_VERSION = 1;
+    private static final int CACHE_VERSION = 2;
     private static final int VALUE_COUNT = 1;
     private static final int IO_BUFFER_SIZE = 8 * 1024;
 

diff --git a/owncloudApp/src/main/res/values-bg-rBG/strings.xml b/owncloudApp/src/main/res/values-bg-rBG/strings.xml
@@ -657,22 +657,6 @@
   <string name="release_notes_footer">Благодарим ви, че използвате %1$s.\n❤</string>
   <string name="release_notes_proceed">Продължаване</string>
   <string name="release_notes_icon">Икона за бележка по изданието</string>
-  <string name="release_notes_4_0_title_1">Поддръжка за пространства</string>
-  <string name="release_notes_4_0_subtitle_1">Въвеждане на поддръжка за функцията за пространства (oCIS). <b>Налична само за нови регистрирани профили</b></string>
-  <string name="release_notes_4_0_title_2">Долна лента за навигация</string>
-  <string name="release_notes_4_0_subtitle_2">Пренареждане на някои раздели</string>
-  <string name="release_notes_4_0_title_3">Край на поддръжката на Lollipop</string>
-  <string name="release_notes_4_0_subtitle_3">Това ще бъде последната версия с поддръжка на Android Lollipop (v5.0)</string>
-  <string name="release_notes_4_0_title_4">Актуализиране на потока от WebFinger</string>
-  <string name="release_notes_4_0_subtitle_4">За сървърите на WebFinger първо ще бъде поисканo търсене в сървър и ако не е успешно, ще бъде последван редовния процес на удостоверяване</string>
-  <string name="release_notes_4_0_title_5">Боравене с разрешения</string>
-  <string name="release_notes_4_0_subtitle_5">Сега, когато липсват разрешения за извършване на някои действия с дадена папка или файл, тези действия ще бъдат скрити.</string>
-  <string name="release_notes_4_0_title_6">Нова настройка \"Управление на известия\"</string>
-  <string name="release_notes_4_0_subtitle_6">В настройките е добавен нов елемент, който пренасочва към настройките за известия на приложението на устройството.</string>
-  <string name="release_notes_4_0_title_7">Незначителни поправки на грешки и подобрения</string>
-  <string name="release_notes_4_0_subtitle_7">Отстранени са някои дребни грешки и са въведени незначителни технически подобрения, за да се подобри работата с приложението.</string>
-  <string name="release_notes_4_1_title_7">Незначителни поправки на грешки и подобрения</string>
-  <string name="release_notes_4_1_subtitle_7">Отстранени са някои дребни грешки и са въведени незначителни технически подобрения, за да се подобри работата с приложението.</string>
   <!--Open in web-->
   <string name="ic_action_open_in_web">Отваряне в мрежата</string>
   <string name="ic_action_open_with_web">Отваряне в %1$s (уеб)</string>

diff --git a/owncloudApp/src/main/res/values-de-rDE/strings.xml b/owncloudApp/src/main/res/values-de-rDE/strings.xml
@@ -659,26 +659,6 @@
   <string name="release_notes_footer">Vielen Dank für die Verwendung von %1$s.\n</string>
   <string name="release_notes_proceed">Fortfahren</string>
   <string name="release_notes_icon">Symbol für Veröffentlichungsnotizen</string>
-  <string name="release_notes_4_0_title_1">Unterstützung für Spaces</string>
-  <string name="release_notes_4_0_subtitle_1">Unterstützung von Spaces (oCIS)<b>Nur verfügbar für neu eingeloggte Konten</b></string>
-  <string name="release_notes_4_0_title_2">Untere Navigationsleiste</string>
-  <string name="release_notes_4_0_subtitle_2">Einige Tabs neu angeordnet</string>
-  <string name="release_notes_4_0_title_3">Unterstützung von Lollipop endet.</string>
-  <string name="release_notes_4_0_subtitle_3">Mit dieser Version wird zum letzten Mal Android Lollipop (v5.0) unterstützt.</string>
-  <string name="release_notes_4_0_title_4">WebFinger Flow aktualisiert</string>
-  <string name="release_notes_4_0_subtitle_4">Bei WebFinger-Servern wird zuerst ein Lookup-Server angefragt. Falls das fehlschlägt, wird die reguläre Authentifizierung durchgeführt.</string>
-  <string name="release_notes_4_0_title_5">Zugriffsrechte</string>
-  <string name="release_notes_4_0_subtitle_5">Wenn für bestimmte Aktionen auf eine Datei oder einen Ordner die notwendigen Zugriffsrechte fehlen, werden diese Aktionen nicht angeboten.</string>
-  <string name="release_notes_4_0_title_6">Neue Einstellung \"Benachrichtigungen verwalten\"</string>
-  <string name="release_notes_4_0_subtitle_6">In den Einstellungen wurde ein neuer Eintrag hinzugefügt, der zu den App-Benachrichtigungseinstellungen des Geräts weiterleitet.</string>
-  <string name="release_notes_4_0_title_7">Kleine Fehlerberichtigungen und Verbesserungen</string>
-  <string name="release_notes_4_0_subtitle_7">Kleine Fehler wurden behoben und geringfügige technische Verbesserungen durchgeführt, um die Benutzung der App zu erleichtern.</string>
-  <string name="release_notes_4_0_title_8">Markdown-Unterstützung</string>
-  <string name="release_notes_4_0_subtitle_8">Markdown-Dateien werden gerendert und im entsprechenden Format dargestellt.</string>
-  <string name="release_notes_4_0_title_9">Liste der Provider (Infinite Scale)</string>
-  <string name="release_notes_4_0_subtitle_9">Wenn der Server zum Öffnen spezifischer Dateiarten App-Provider unterstützt, werden alle in der Detail-Ansicht angezeigt.</string>
-  <string name="release_notes_4_1_title_7">Kleine Fehlerberichtigungen und Verbesserungen</string>
-  <string name="release_notes_4_1_subtitle_7">Kleine Fehler wurden behoben und geringfügige technische Verbesserungen durchgeführt, um die Benutzung der App zu erleichtern.</string>
   <!--Open in web-->
   <string name="ic_action_open_in_web">Öffnen im Webbrowser</string>
   <string name="ic_action_open_with_web">Öffnen in %1$s (web)</string>

diff --git a/owncloudApp/src/main/res/values-de/strings.xml b/owncloudApp/src/main/res/values-de/strings.xml
@@ -659,26 +659,6 @@
   <string name="release_notes_footer">Vielen Dank für die Verwendung von %1$s.\n</string>
   <string name="release_notes_proceed">Fortfahren</string>
   <string name="release_notes_icon">Icon für Veröffentlichungsnotizen</string>
-  <string name="release_notes_4_0_title_1">Unterstützung für Spaces</string>
-  <string name="release_notes_4_0_subtitle_1">Unterstützung von Spaces (oCIS)<b>Nur verfügbar für neu eingeloggte Konten</b></string>
-  <string name="release_notes_4_0_title_2">Untere Navigationsleiste</string>
-  <string name="release_notes_4_0_subtitle_2">Einige Tabs neu angeordnet</string>
-  <string name="release_notes_4_0_title_3">Unterstützung von Lollipop endet.</string>
-  <string name="release_notes_4_0_subtitle_3">Mit dieser Version wird zum letzten Mal Android Lollipop (v5.0) unterstützt.</string>
-  <string name="release_notes_4_0_title_4">WebFinger Flow aktualisiert</string>
-  <string name="release_notes_4_0_subtitle_4">Bei WebFinger-Servern wird zuerst ein Lookup-Server angefragt. Falls das fehlschlägt, wird die reguläre Authentifizierung durchgeführt.</string>
-  <string name="release_notes_4_0_title_5">Zugriffsrechte</string>
-  <string name="release_notes_4_0_subtitle_5">Wenn für bestimmte Aktionen auf eine Datei oder einen Ordner die notwendigen Zugriffsrechte fehlen, werden diese Aktionen nicht angeboten.</string>
-  <string name="release_notes_4_0_title_6">Neue Einstellung \"Benachrichtigungen verwalten\"</string>
-  <string name="release_notes_4_0_subtitle_6">In den Einstellungen wurde ein neuer Eintrag hinzugefügt, der zu den App-Benachrichtigungseinstellungen des Geräts weiterleitet.</string>
-  <string name="release_notes_4_0_title_7">Kleine Fehlerberichtigungen und Verbesserungen</string>
-  <string name="release_notes_4_0_subtitle_7">Kleine Fehler wurden behoben und geringfügige technische Verbesserungen durchgeführt, um die Benutzung der App zu erleichtern.</string>
-  <string name="release_notes_4_0_title_8">Markdown-Unterstützung</string>
-  <string name="release_notes_4_0_subtitle_8">Markdown-Dateien werden gerendert und im entsprechenden Format dargestellt.</string>
-  <string name="release_notes_4_0_title_9">Liste der Provider (Infinite Scale)</string>
-  <string name="release_notes_4_0_subtitle_9">Wenn der Server zum Öffnen spezifischer Dateiarten App-Provider unterstützt, werden alle in der Detail-Ansicht angezeigt.</string>
-  <string name="release_notes_4_1_title_7">Kleine Fehlerberichtigungen und Verbesserungen</string>
-  <string name="release_notes_4_1_subtitle_7">Kleine Fehler wurden behoben und geringfügige technische Verbesserungen durchgeführt, um die Benutzung der App zu erleichtern.</string>
   <!--Open in web-->
   <string name="ic_action_open_in_web">Öffnen im Webbrowser</string>
   <string name="ic_action_open_with_web">Öffnen in %1$s (web)</string>
-Original file line number
+Diff line change
@@ Expand Up / @@ -256,7 +256,7 @@ class MainFileListViewModel( @@
                     TODO()
                 }
-                updateFolderToDisplay(parentDir!!)
+                parentDir?.let { updateFolderToDisplay(it) }
             }
         }
@@ Expand Down @@