Merge branch 'master' of github.com:/nextcloud/android

src/main/java/com/owncloud/android/datamodel/OCFile.java

@@ -503,6 +503,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
         mEtagInConflict = null;
         mShareWithSharee = false;
         mIsFavorite = false;
+        mIsEncrypted = false;
+        mEncryptedFileName = null;
     }
 
     /**

src/main/java/com/owncloud/android/datastorage/DataStorageProvider.java

@@ -111,13 +111,19 @@ public class DataStorageProvider {
 
         // Add external storage directory if available.
         if (isExternalStorageWritable()) {
-            storagePoint = new StoragePoint();
-            storagePoint.setPath(MainApp.getAppContext().getExternalFilesDir(null).getAbsolutePath());
-            storagePoint.setDescription(MainApp.getAppContext().getExternalFilesDir(null).getAbsolutePath());
-            storagePoint.setPrivacyType(StoragePoint.PrivacyType.PRIVATE);
-            storagePoint.setStorageType(StoragePoint.StorageType.EXTERNAL);
-            if (!paths.contains(MainApp.getAppContext().getExternalFilesDir(null).getAbsolutePath())) {
-                mCachedStoragePoints.add(storagePoint);
+            File externalFilesDir = MainApp.getAppContext().getExternalFilesDir(null);
+
+            if (externalFilesDir != null) {
+                String externalFilesDirPath = externalFilesDir.getAbsolutePath();
+
+                storagePoint = new StoragePoint();
+                storagePoint.setPath(externalFilesDirPath);
+                storagePoint.setDescription(externalFilesDirPath);
+                storagePoint.setPrivacyType(StoragePoint.PrivacyType.PRIVATE);
+                storagePoint.setStorageType(StoragePoint.StorageType.EXTERNAL);
+                if (!paths.contains(externalFilesDirPath)) {
+                    mCachedStoragePoints.add(storagePoint);
+                }
             }
         }
 

src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -595,16 +595,6 @@ public class FileDisplayActivity extends HookActivity
         OCFileListFragment fileListFragment = getListOfFilesFragment();
         if (fileListFragment != null) {
             fileListFragment.listDirectory(MainApp.isOnlyOnDevice(), fromSearch);
-
-            AddFloatingActionButton addButton = fileListFragment.getFabMain().getAddButton();
-            addButton.setColorNormal(ThemeUtils.primaryColor());
-            addButton.setColorPressed(ThemeUtils.primaryDarkColor());
-            addButton.setPlusColor(ThemeUtils.fontColor());
-
-            ThemeUtils.tintFloatingActionButton(fileListFragment.getFabUpload(), R.drawable.ic_action_upload);
-            ThemeUtils.tintFloatingActionButton(fileListFragment.getFabMkdir(), R.drawable.ic_action_create_dir);
-            ThemeUtils.tintFloatingActionButton(fileListFragment.getFabUploadFromApp(), R.drawable.ic_import);
-
             setupToolbar();
         }
     }

src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -58,6 +58,7 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.getbase.floatingactionbutton.AddFloatingActionButton;
 import com.getbase.floatingactionbutton.FloatingActionButton;
 import com.getbase.floatingactionbutton.FloatingActionsMenu;
 import com.owncloud.android.MainApp;
@@ -441,6 +442,8 @@ public class ExtendedListFragment extends Fragment
         mFabMkdir = v.findViewById(R.id.fab_mkdir);
         mFabUploadFromApp = v.findViewById(R.id.fab_upload_from_app);
 
+        applyFABTheming();
+
         boolean searchSupported = AccountUtils.hasSearchSupport(AccountUtils.
                 getCurrentOwnCloudAccount(MainApp.getAppContext()));
 
@@ -708,6 +711,21 @@ public class ExtendedListFragment extends Fragment
         }
     }
 
+
+    /**
+     * Set tinting of FAB's from server data
+     */
+    private void applyFABTheming() {
+        AddFloatingActionButton addButton = getFabMain().getAddButton();
+        addButton.setColorNormal(ThemeUtils.primaryColor());
+        addButton.setColorPressed(ThemeUtils.primaryDarkColor());
+        addButton.setPlusColor(ThemeUtils.fontColor());
+
+        ThemeUtils.tintFloatingActionButton(getFabUpload(), R.drawable.ic_action_upload);
+        ThemeUtils.tintFloatingActionButton(getFabMkdir(), R.drawable.ic_action_create_dir);
+        ThemeUtils.tintFloatingActionButton(getFabUploadFromApp(), R.drawable.ic_import);
+    }
+
     /**
      * Set message for empty list view.
      */

src/main/java/com/owncloud/android/utils/FileStorageUtils.java

@@ -217,7 +217,9 @@ public class FileStorageUtils {
         file.setPermissions(remote.getPermissions());
         file.setRemoteId(remote.getRemoteId());
         file.setFavorite(remote.getIsFavorite());
-        file.setEncrypted(remote.getIsEncrypted());
+        if (file.isFolder()) {
+            file.setEncrypted(remote.getIsEncrypted());
+        }
         return file;
     }
 

src/main/res/values-b+en+001/strings.xml

@@ -721,7 +721,6 @@
     <string name="notification_channel_media_description">Music player progress</string>
     <string name="notification_channel_file_sync_name">File sync</string>
     <string name="notification_channel_file_sync_description">Shows file sync progress and results</string>
-  
     <string name="account_not_found">Account not found!</string>
 
     <string name="screenshot_01_gridView">A safe home for all your data</string>

src/main/res/values-de-rDE/strings.xml

@@ -721,7 +721,6 @@
     <string name="notification_channel_media_description">Musik-Player Fortschritt</string>
     <string name="notification_channel_file_sync_name">Dateisynchronisierung</string>
     <string name="notification_channel_file_sync_description">Zeigt den Fortschritt der Dateisynchronisierung und die Ergebnisse an</string>
-  
     <string name="account_not_found">Kein Konto gefunden</string>
 
     <string name="screenshot_01_gridView">Ein sicheres Zuhause für all Ihre Daten</string>

src/main/res/values-de/strings.xml

@@ -723,7 +723,6 @@
     <string name="notification_channel_media_description">Musik-Player Fortschritt</string>
     <string name="notification_channel_file_sync_name">Dateisynchronisierung</string>
     <string name="notification_channel_file_sync_description">Zeigt den Fortschritt der Dateisynchronisierung und die Ergebnisse an</string>
-  
     <string name="account_not_found">Kein Konto gefunden</string>
 
     <string name="screenshot_01_gridView">Ein sicheres Zuhause für all Deine Daten</string>

src/main/res/values-es-rMX/strings.xml

@@ -722,7 +722,6 @@
     <string name="notification_channel_media_description">Progreso del reproductor de música</string>
     <string name="notification_channel_file_sync_name">Sincronizar archivo</string>
     <string name="notification_channel_file_sync_description">Muestra el progreso de la sincronización de archivos y los resultados</string>
-  
     <string name="account_not_found">¡No se encontró la cuenta!</string>
 
     <string name="screenshot_01_gridView">Un lugar seguro para todos tus datos</string>

src/main/res/values-es/strings.xml

@@ -721,7 +721,6 @@
     <string name="notification_channel_media_description">Progreso del reproductor de música</string>
     <string name="notification_channel_file_sync_name">Sincronización de archivos</string>
     <string name="notification_channel_file_sync_description">Muestra progreso y resultados de la sincronización de archivos</string>
-  
     <string name="account_not_found">¡Cuenta no encontrada!</string>
 
     <string name="screenshot_01_gridView">Un lugar seguro para tus datos</string>

src/main/res/values-fi-rFI/strings.xml

@@ -512,7 +512,6 @@
     <string name="notification_channel_upload_description">Näyttää lähetyksen edistymisen</string>
     <string name="notification_channel_media_name">Mediasoitin</string>
     <string name="notification_channel_file_sync_description">Näyttää tiedostojen synkronoinnin edistymisen ja tulokset</string>
-  
     <string name="account_not_found">Tiliä ei löydy!</string>
 
     <string name="screenshot_01_gridView">Turvallinen koti kaikille tiedoillesi</string>

src/main/res/values-fr/strings.xml

@@ -255,6 +255,7 @@ Attention la suppression est irréversible.</string>
 	<string name="auth_expired_saml_sso_token_toast">Votre session a expiré. Merci de vous reconnecter</string>
     <string name="auth_connecting_auth_server">Connexion au serveur d\'authentification &#8230;</string>
 	<string name="auth_unsupported_multiaccount">%1$s ne prend pas en charge les comptes multiples</string>
+	<string name="auth_fail_get_user_name">Votre serveur a retourné un identifiant d\'utilisateur incorrect. Veuillez contacter un administrateur</string>
 	<string name="auth_can_not_auth_against_server">Impossible de s\'authentifier sur ce serveur</string>
     <string name="auth_access_failed">L\'accès a échoué</string>
 
@@ -572,6 +573,7 @@ Attention la suppression est irréversible.</string>
     <string name="welcome_feature_3_title">Téléversement automatique</string>
     <string name="welcome_feature_3_text">Conservez vos photos en toute sécurité</string>
 
+    <string name="whats_new_end_to_end_encryption_title">Chiffrement de bout en bout</string>
     <string name="whats_new_skip">Ignorer</string>
 
     <string name="fingerprint_scan_finger">Veuillez scanner votre doigt</string>
@@ -683,7 +685,6 @@ Attention la suppression est irréversible.</string>
     <string name="notification_channel_media_description">Progression du lecteur de musique</string>
     <string name="notification_channel_file_sync_name">Synchronisation de fichier</string>
     <string name="notification_channel_file_sync_description">Afficher les résultats et la progression de synchronisation du fichier</string>
-  
     <string name="account_not_found">Compte introuvable !</string>
 
     <string name="screenshot_01_gridView">Un lieu sûr pour toutes vos données</string>

src/main/res/values-hu-rHU/strings.xml

@@ -735,7 +735,6 @@ A Nextcloud itt érhető el: https://nextcloud.com</string>
     <string name="notification_channel_media_description">Zene lejátszó folyamatai</string>
     <string name="notification_channel_file_sync_name">Fájl szinkronizálás</string>
     <string name="notification_channel_file_sync_description">Mutassa a fájl szinkronizációt és eredményeit</string>
-  
     <string name="account_not_found">Fiók nem található!</string>
 
     <string name="screenshot_01_gridView">Egy biztonságos hely az adataidnak</string>

src/main/res/values-it/strings.xml

@@ -721,7 +721,6 @@
     <string name="notification_channel_media_description">Avanzamento del lettore musicale</string>
     <string name="notification_channel_file_sync_name">Sincronizzazione file</string>
     <string name="notification_channel_file_sync_description">Mostra l\'avanzamento e i risultati della sincronizzazione file</string>
-  
     <string name="account_not_found">Account non trovato</string>
 
     <string name="screenshot_01_gridView">Un posto sicuro per tutti i tuoi dati</string>

src/main/res/values-ka-rGE/strings.xml

@@ -716,7 +716,6 @@
     <string name="notification_channel_media_description">მუსიკის დამკვრელის პროგრესი</string>
     <string name="notification_channel_file_sync_name">ფაილების სინქ.</string>
     <string name="notification_channel_file_sync_description">აჩვენებს ფაილების სინქ. პროგრესს და შედეგებს</string>
-  
     <string name="account_not_found">ანგარიში ვერ იქნა ნაპოვნი!</string>
 
     <string name="screenshot_01_gridView">უსაფრთხო სახლი მთელი თქვენი მონაცემებისათვის</string>

src/main/res/values-ko/strings.xml

@@ -709,7 +709,6 @@
     <string name="notification_channel_media_description">미디어 재생기 진행</string>
     <string name="notification_channel_file_sync_name">파일 동기화</string>
     <string name="notification_channel_file_sync_description">파일 동기화 진행 및 결과 표시</string>
-  
     <string name="account_not_found">계정을 찾을 수 없습니다!</string>
 
     <string name="screenshot_01_gridView">내 모든 데이터를 위한 안전한 저장소</string>

src/main/res/values-nb-rNO/strings.xml

@@ -671,7 +671,6 @@
     <string name="notification_channel_media_description">Musikkspillerframdrift</string>
     <string name="notification_channel_file_sync_name">Filsynkronisering</string>
     <string name="notification_channel_file_sync_description">Viser filsynkroniseringsframdrift og resultater</string>
-  
     <string name="account_not_found">Konto ble ikke funnet!</string>
 
     <string name="screenshot_01_gridView">Et trygt hjem for alle dine data</string>

src/main/res/values-nl/strings.xml

@@ -665,7 +665,6 @@
     <string name="notification_channel_media_description">Mediaspeler voortgang</string>
     <string name="notification_channel_file_sync_name">Bestand sync</string>
     <string name="notification_channel_file_sync_description">Geeft bestand sync voortgang en resultaten weer</string>
-  
     <string name="account_not_found">Account niet gevonden!</string>
 
     <string name="screenshot_01_gridView">Een veilige plek voor al je data</string>

src/main/res/values-pt-rBR/strings.xml

@@ -721,7 +721,6 @@
     <string name="notification_channel_media_description">Progresso do tocador de mídia</string>
     <string name="notification_channel_file_sync_name">Sincronização de arquivo</string>
     <string name="notification_channel_file_sync_description">Mostra o progresso sincronização de arquivo e resultados</string>
-  
     <string name="account_not_found">Conta não encontrada!</string>
 
     <string name="screenshot_01_gridView">Um lugar seguro para seus dados</string>

src/main/res/values-ru/strings.xml

@@ -724,7 +724,6 @@
     <string name="notification_channel_media_description">Состояние воспроизведения музыки</string>
     <string name="notification_channel_file_sync_name">Синхронизация файлов</string>
     <string name="notification_channel_file_sync_description">Показывает состояние и результаты синхронизации файлов </string>
-  
     <string name="account_not_found">Учётная запись не найдена!</string>
 
     <string name="screenshot_01_gridView">Надёжный дом для всех ваших данных</string>

src/main/res/values-sr/strings.xml

@@ -726,7 +726,6 @@
     <string name="notification_channel_media_description">Напредак музичког плејера</string>
     <string name="notification_channel_file_sync_name">Синхронизација фајла</string>
     <string name="notification_channel_file_sync_description">Прикажи напредак синхронизације фајла и резултате</string>
-  
     <string name="account_not_found">Налог није нађен!</string>
 
     <string name="screenshot_01_gridView">Сигурно место за све Ваше податке</string>

src/main/res/values-tr/strings.xml

@@ -721,7 +721,6 @@
     <string name="notification_channel_media_description">Müzik çalar ilerlemesi</string>
     <string name="notification_channel_file_sync_name">Dosya eşitleme</string>
     <string name="notification_channel_file_sync_description">Dosya eşitleme ilerlemesi ve sonuçlarını görüntüler</string>
-  
     <string name="account_not_found">Hesap bulunamadı!</string>
 
     <string name="screenshot_01_gridView">Verileriniz için güvenli bir yer!</string>

src/main/res/values-zh-rCN/strings.xml

@@ -634,7 +634,6 @@
     <string name="notification_channel_media_description">音乐播放器进度</string>
     <string name="notification_channel_file_sync_name">文件同步</string>
     <string name="notification_channel_file_sync_description">显示文件同步进度和结果</string>
-  
     <string name="account_not_found">账户未找到</string>
 
     <string name="screenshot_01_gridView">为你的数据找一个安全的家</string>