Эх сурвалжийг харах

Merge pull request #2509 from nextcloud/lintFixes

fix more  lint issues
Andy Scherzinger 7 жил өмнө
parent
commit
46d1d3bf68
45 өөрчлөгдсөн 125 нэмэгдсэн , 151 устгасан
  1. 1 0
      drawable_resources/account_circle_white.svg
  2. 1 1
      scripts/lint/lint-results.txt
  3. 4 2
      src/main/AndroidManifest.xml
  4. 1 1
      src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java
  5. 1 1
      src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
  6. 1 1
      src/main/java/com/owncloud/android/utils/DisplayUtils.java
  7. 7 5
      src/main/java/com/owncloud/android/utils/FileSortOrderByName.java
  8. 0 0
      src/main/res/drawable-hdpi/badge_favorite.png
  9. BIN
      src/main/res/drawable-hdpi/ic_account_circle.png
  10. BIN
      src/main/res/drawable-hdpi/ic_account_circle_white_18dp.png
  11. 0 0
      src/main/res/drawable-mdpi/badge_favorite.png
  12. BIN
      src/main/res/drawable-mdpi/ic_account_circle_white_18dp.png
  13. 0 0
      src/main/res/drawable-xhdpi/badge_favorite.png
  14. BIN
      src/main/res/drawable-xhdpi/ic_account_circle.png
  15. BIN
      src/main/res/drawable-xhdpi/ic_account_circle_white_18dp.png
  16. 0 0
      src/main/res/drawable-xxhdpi/badge_favorite.png
  17. BIN
      src/main/res/drawable-xxhdpi/ic_account_circle.png
  18. BIN
      src/main/res/drawable-xxhdpi/ic_account_circle_white_18dp.png
  19. 0 0
      src/main/res/drawable-xxxhdpi/badge_favorite.png
  20. BIN
      src/main/res/drawable-xxxhdpi/ic_account_circle_white_18dp.png
  21. 23 0
      src/main/res/drawable/account_circle_white.xml
  22. 3 3
      src/main/res/layout/account_item.xml
  23. 3 3
      src/main/res/layout/drawer_header.xml
  24. 0 1
      src/main/res/layout/file_details_empty.xml
  25. 2 3
      src/main/res/layout/files.xml
  26. 1 1
      src/main/res/layout/grid_image.xml
  27. 1 1
      src/main/res/layout/grid_item.xml
  28. 0 38
      src/main/res/layout/list_fragment_expandable.xml
  29. 1 1
      src/main/res/layout/list_item.xml
  30. 3 2
      src/main/res/layout/media_control.xml
  31. 70 74
      src/main/res/layout/synced_folders_item_header.xml
  32. 1 1
      src/main/res/layout/toolbar_user_information.xml
  33. 1 0
      src/main/res/layout/upload_list_item.xml
  34. 0 1
      src/main/res/values-b+en+001/strings.xml
  35. 0 1
      src/main/res/values-de/strings.xml
  36. 0 1
      src/main/res/values-es/strings.xml
  37. 0 1
      src/main/res/values-fr/strings.xml
  38. 0 1
      src/main/res/values-hu-rHU/strings.xml
  39. 0 1
      src/main/res/values-it/strings.xml
  40. 0 1
      src/main/res/values-nl/strings.xml
  41. 0 1
      src/main/res/values-pt-rBR/strings.xml
  42. 0 1
      src/main/res/values-ru/strings.xml
  43. 0 1
      src/main/res/values-sr/strings.xml
  44. 0 1
      src/main/res/values-tr/strings.xml
  45. 0 1
      src/main/res/values/strings.xml

+ 1 - 0
drawable_resources/account_circle_white.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M12,19.2C9.5,19.2 7.29,17.92 6,16C6.03,14 10,12.9 12,12.9C14,12.9 17.97,14 18,16C16.71,17.92 14.5,19.2 12,19.2M12,5A3,3 0 0,1 15,8A3,3 0 0,1 12,11A3,3 0 0,1 9,8A3,3 0 0,1 12,5M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z" /></svg>

+ 1 - 1
scripts/lint/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 127 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 114 warnings</span>

+ 4 - 2
src/main/AndroidManifest.xml

@@ -19,7 +19,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.owncloud.android">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.owncloud.android">
 
 
     <!-- GET_ACCOUNTS is needed for API <= 22.
     <!-- GET_ACCOUNTS is needed for API <= 22.
         For API >= 23 results in the addition of CONTACTS group to the list of permissions that may be
         For API >= 23 results in the addition of CONTACTS group to the list of permissions that may be
@@ -75,7 +76,8 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:supportsRtl="true"
         android:installLocation="internalOnly"
         android:installLocation="internalOnly"
-        android:manageSpaceActivity="com.owncloud.android.ui.activity.ManageSpaceActivity">
+        android:manageSpaceActivity="com.owncloud.android.ui.activity.ManageSpaceActivity"
+        tools:ignore="UnusedAttribute">
         <activity
         <activity
             android:name=".ui.activity.FileDisplayActivity"
             android:name=".ui.activity.FileDisplayActivity"
             android:label="@string/app_name"
             android:label="@string/app_name"

+ 1 - 1
src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java

@@ -100,7 +100,7 @@ public class ManageAccountsActivity extends FileActivity
     protected void onCreate(Bundle savedInstanceState) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
 
 
-        mTintedCheck = DrawableCompat.wrap(ContextCompat.getDrawable(this, R.drawable.ic_account_circle_white_18dp));
+        mTintedCheck = DrawableCompat.wrap(ContextCompat.getDrawable(this, R.drawable.account_circle_white));
         int tint = ThemeUtils.primaryColor(this);
         int tint = ThemeUtils.primaryColor(this);
         DrawableCompat.setTint(mTintedCheck, tint);
         DrawableCompat.setTint(mTintedCheck, tint);
 
 

+ 1 - 1
src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -290,7 +290,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
             AlertDialog.Builder builder = new Builder(parent);
             AlertDialog.Builder builder = new Builder(parent);
 
 
             mTintedCheck = DrawableCompat.wrap(ContextCompat.getDrawable(parent,
             mTintedCheck = DrawableCompat.wrap(ContextCompat.getDrawable(parent,
-                    R.drawable.ic_account_circle_white_18dp));
+                    R.drawable.account_circle_white));
             int tint = ThemeUtils.primaryColor(getContext());
             int tint = ThemeUtils.primaryColor(getContext());
             DrawableCompat.setTint(mTintedCheck, tint);
             DrawableCompat.setTint(mTintedCheck, tint);
 
 

+ 1 - 1
src/main/java/com/owncloud/android/utils/DisplayUtils.java

@@ -462,7 +462,7 @@ public class DisplayUtils {
                     avatar = TextDrawable.createAvatar(account.name, avatarRadius);
                     avatar = TextDrawable.createAvatar(account.name, avatarRadius);
                 } catch (Exception e) {
                 } catch (Exception e) {
                     Log_OC.e(TAG, "Error calculating RGB value for active account icon.", e);
                     Log_OC.e(TAG, "Error calculating RGB value for active account icon.", e);
-                    avatar = resources.getDrawable(R.drawable.ic_account_circle);
+                    avatar = resources.getDrawable(R.drawable.account_circle_white);
                 }
                 }
             }
             }
 
 

+ 7 - 5
src/main/java/com/owncloud/android/utils/FileSortOrderByName.java

@@ -28,6 +28,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Comparator;
 import java.util.List;
 import java.util.List;
+import java.util.Locale;
 
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import third_parties.daveKoeller.AlphanumComparator;
 import third_parties.daveKoeller.AlphanumComparator;
@@ -35,7 +36,6 @@ import third_parties.daveKoeller.AlphanumComparator;
 /**
 /**
  * Created by srkunze on 28.08.17.
  * Created by srkunze on 28.08.17.
  */
  */
-
 public class FileSortOrderByName extends FileSortOrder {
 public class FileSortOrderByName extends FileSortOrder {
 
 
     public FileSortOrderByName(String name, boolean ascending) {
     public FileSortOrderByName(String name, boolean ascending) {
@@ -75,19 +75,21 @@ public class FileSortOrderByName extends FileSortOrder {
     public File[] sortLocalFiles(File[] filesArray) {
     public File[] sortLocalFiles(File[] filesArray) {
         final int multiplier = mAscending ? 1 : -1;
         final int multiplier = mAscending ? 1 : -1;
 
 
-        List<File> files = new ArrayList<File>(Arrays.asList(filesArray));
+        List<File> files = new ArrayList<>(Arrays.asList(filesArray));
 
 
         Collections.sort(files, new Comparator<File>() {
         Collections.sort(files, new Comparator<File>() {
             public int compare(File o1, File o2) {
             public int compare(File o1, File o2) {
                 if (o1.isDirectory() && o2.isDirectory()) {
                 if (o1.isDirectory() && o2.isDirectory()) {
-                    return multiplier * o1.getPath().toLowerCase().compareTo(o2.getPath().toLowerCase());
+                    return multiplier * o1.getPath().toLowerCase(Locale.getDefault())
+                            .compareTo(o2.getPath().toLowerCase(Locale.getDefault()));
                 } else if (o1.isDirectory()) {
                 } else if (o1.isDirectory()) {
                     return -1;
                     return -1;
                 } else if (o2.isDirectory()) {
                 } else if (o2.isDirectory()) {
                     return 1;
                     return 1;
                 }
                 }
-                return multiplier * new AlphanumComparator().compare(o1.getPath().toLowerCase(),
-                        o2.getPath().toLowerCase());
+                return multiplier * new AlphanumComparator().compare(o1.getPath()
+                                .toLowerCase(Locale.getDefault()),
+                        o2.getPath().toLowerCase(Locale.getDefault()));
             }
             }
         });
         });
 
 

+ 0 - 0
src/main/res/drawable-hdpi/ic_favorite.png → src/main/res/drawable-hdpi/badge_favorite.png


BIN
src/main/res/drawable-hdpi/ic_account_circle.png


BIN
src/main/res/drawable-hdpi/ic_account_circle_white_18dp.png


+ 0 - 0
src/main/res/drawable-mdpi/ic_favorite.png → src/main/res/drawable-mdpi/badge_favorite.png


BIN
src/main/res/drawable-mdpi/ic_account_circle_white_18dp.png


+ 0 - 0
src/main/res/drawable-xhdpi/ic_favorite.png → src/main/res/drawable-xhdpi/badge_favorite.png


BIN
src/main/res/drawable-xhdpi/ic_account_circle.png


BIN
src/main/res/drawable-xhdpi/ic_account_circle_white_18dp.png


+ 0 - 0
src/main/res/drawable-xxhdpi/ic_favorite.png → src/main/res/drawable-xxhdpi/badge_favorite.png


BIN
src/main/res/drawable-xxhdpi/ic_account_circle.png


BIN
src/main/res/drawable-xxhdpi/ic_account_circle_white_18dp.png


+ 0 - 0
src/main/res/drawable-xxxhdpi/ic_favorite.png → src/main/res/drawable-xxxhdpi/badge_favorite.png


BIN
src/main/res/drawable-xxxhdpi/ic_account_circle_white_18dp.png


+ 23 - 0
src/main/res/drawable/account_circle_white.xml

@@ -0,0 +1,23 @@
+<!--
+    @author Google LLC
+    Copyright (C) 2018 Google LLC
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFF" android:pathData="M12,19.2C9.5,19.2 7.29,17.92 6,16C6.03,14 10,12.9 12,12.9C14,12.9 17.97,14 18,16C16.71,17.92 14.5,19.2 12,19.2M12,5A3,3 0 0,1 15,8A3,3 0 0,1 12,11A3,3 0 0,1 9,8A3,3 0 0,1 12,5M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z" />
+</vector>

+ 3 - 3
src/main/res/layout/account_item.xml

@@ -50,11 +50,11 @@
 
 
         <ImageView
         <ImageView
             android:id="@+id/ticker"
             android:id="@+id/ticker"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
             android:layout_gravity="bottom|end"
             android:layout_gravity="bottom|end"
             android:background="@drawable/round_bgnd"
             android:background="@drawable/round_bgnd"
-            android:src="@drawable/ic_account_circle_white_18dp"
+            android:src="@drawable/account_circle_white"
             android:contentDescription="@string/active_user"/>
             android:contentDescription="@string/active_user"/>
     </FrameLayout>
     </FrameLayout>
 
 

+ 3 - 3
src/main/res/layout/drawer_header.xml

@@ -50,7 +50,7 @@
                 android:id="@+id/drawer_current_account"
                 android:id="@+id/drawer_current_account"
                 android:layout_width="@dimen/nav_drawer_header_avatar"
                 android:layout_width="@dimen/nav_drawer_header_avatar"
                 android:layout_height="@dimen/nav_drawer_header_avatar"
                 android:layout_height="@dimen/nav_drawer_header_avatar"
-                android:src="@drawable/ic_account_circle"
+                android:src="@drawable/account_circle_white"
                 android:contentDescription="@string/drawer_current_account"/>
                 android:contentDescription="@string/drawer_current_account"/>
 
 
             <ImageView
             <ImageView
@@ -60,7 +60,7 @@
                 android:layout_gravity="end"
                 android:layout_gravity="end"
                 android:layout_marginEnd="@dimen/nav_drawer_header_avatar_second_account_margin"
                 android:layout_marginEnd="@dimen/nav_drawer_header_avatar_second_account_margin"
                 android:layout_marginRight="@dimen/nav_drawer_header_avatar_second_account_margin"
                 android:layout_marginRight="@dimen/nav_drawer_header_avatar_second_account_margin"
-                android:src="@drawable/ic_account_circle"
+                android:src="@drawable/account_circle_white"
                 android:onClick="onAccountDrawerClick"
                 android:onClick="onAccountDrawerClick"
                 android:contentDescription="@string/drawer_middle_account"/>
                 android:contentDescription="@string/drawer_middle_account"/>
 
 
@@ -69,7 +69,7 @@
                 android:layout_width="@dimen/nav_drawer_header_avatar_other_accounts_size"
                 android:layout_width="@dimen/nav_drawer_header_avatar_other_accounts_size"
                 android:layout_height="@dimen/nav_drawer_header_avatar_other_accounts_size"
                 android:layout_height="@dimen/nav_drawer_header_avatar_other_accounts_size"
                 android:layout_gravity="end"
                 android:layout_gravity="end"
-                android:src="@drawable/ic_account_circle"
+                android:src="@drawable/account_circle_white"
                 android:onClick="onAccountDrawerClick"
                 android:onClick="onAccountDrawerClick"
                 android:contentDescription="@string/drawer_end_account"/>
                 android:contentDescription="@string/drawer_end_account"/>
 
 

+ 0 - 1
src/main/res/layout/file_details_empty.xml

@@ -20,7 +20,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:layout_height="match_parent"
-    android:background="@color/background_color"
     android:orientation="vertical">
     android:orientation="vertical">
 
 
     <TextView 
     <TextView 

+ 2 - 3
src/main/res/layout/files.xml

@@ -38,11 +38,10 @@
             android:layout_width="match_parent"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_height="match_parent"
             android:background="@color/background_color"
             android:background="@color/background_color"
-
+            android:baselineAligned="false"
             android:orientation="horizontal"
             android:orientation="horizontal"
             android:id="@+id/ListLayout"
             android:id="@+id/ListLayout"
-            android:contentDescription="@string/list_layout"
-            >
+            android:contentDescription="@string/list_layout">
 
 
             <FrameLayout
             <FrameLayout
                 android:id="@+id/left_fragment_container"
                 android:id="@+id/left_fragment_container"

+ 1 - 1
src/main/res/layout/grid_image.xml

@@ -43,7 +43,7 @@
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="top|end"
             android:layout_gravity="top|end"
             android:layout_margin="@dimen/standard_quarter_margin"
             android:layout_margin="@dimen/standard_quarter_margin"
-            android:src="@drawable/ic_favorite"
+            android:src="@drawable/badge_favorite"
             android:contentDescription="@string/favorite_icon" />
             android:contentDescription="@string/favorite_icon" />
 
 
         <ImageView
         <ImageView

+ 1 - 1
src/main/res/layout/grid_item.xml

@@ -43,7 +43,7 @@
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="top|end"
             android:layout_gravity="top|end"
             android:layout_margin="@dimen/standard_quarter_margin"
             android:layout_margin="@dimen/standard_quarter_margin"
-            android:src="@drawable/ic_favorite"
+            android:src="@drawable/badge_favorite"
             android:contentDescription="@string/favorite_icon"/>
             android:contentDescription="@string/favorite_icon"/>
 
 
         <ImageView
         <ImageView

+ 0 - 38
src/main/res/layout/list_fragment_expandable.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-This must be a clone of list_fragment.xml 
-
-EXCEPT: ExpandableListView must be used for @+id/swipe_refresh_files_emptyView
- -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="@dimen/zero"
-	android:layout_height="match_parent"
-	android:layout_weight="1" >
-
-    <android.support.v4.widget.SwipeRefreshLayout
-        android:id="@+id/swipe_refresh_files"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-
-        <ExpandableListView 
-            android:id="@+id/list_root"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-        
-    </android.support.v4.widget.SwipeRefreshLayout>
-
-    <android.support.v4.widget.SwipeRefreshLayout
-        android:id="@+id/swipe_refresh_files_emptyView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone" >
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" >
-
-			<include layout="@layout/empty_list" />
-
-        </ScrollView>
-    </android.support.v4.widget.SwipeRefreshLayout>
-</FrameLayout>

+ 1 - 1
src/main/res/layout/list_item.xml

@@ -61,7 +61,7 @@
                 android:layout_marginRight="@dimen/standard_quarter_margin"
                 android:layout_marginRight="@dimen/standard_quarter_margin"
                 android:layout_marginEnd="@dimen/standard_quarter_margin"
                 android:layout_marginEnd="@dimen/standard_quarter_margin"
                 android:contentDescription="@string/favorite"
                 android:contentDescription="@string/favorite"
-                android:src="@drawable/ic_favorite" />
+                android:src="@drawable/badge_favorite" />
 
 
             <ImageView
             <ImageView
                 android:id="@+id/keptOfflineIcon"
                 android:id="@+id/keptOfflineIcon"

+ 3 - 2
src/main/res/layout/media_control.xml

@@ -17,8 +17,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
   
   
 -->
 -->
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical">
     android:orientation="vertical">
@@ -74,7 +74,8 @@
             android:layout_width="0dp"
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_weight="1"
             android:layout_height="@dimen/seek_bar_height"
             android:layout_height="@dimen/seek_bar_height"
-            android:splitTrack="false"/>
+            android:splitTrack="false"
+            tools:ignore="UnusedAttribute" />
 
 
         <TextView android:id="@+id/totalTimeText"
         <TextView android:id="@+id/totalTimeText"
             android:textSize="@dimen/two_line_secondary_text_size"
             android:textSize="@dimen/two_line_secondary_text_size"

+ 70 - 74
src/main/res/layout/synced_folders_item_header.xml

@@ -19,87 +19,83 @@
   License along with this program. If not, see <http://www.gnu.org/licenses/>.
   License along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/header_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="@dimen/alternate_half_padding"
+    android:paddingEnd="@dimen/zero"
+    android:paddingLeft="@dimen/standard_padding"
+    android:paddingRight="@dimen/zero"
+    android:paddingStart="@dimen/standard_padding"
+    android:paddingTop="@dimen/alternate_half_padding">
 
 
-    <RelativeLayout
-        android:id="@+id/header_container"
-        android:layout_width="match_parent"
+    <LinearLayout
+        android:id="@+id/title_container"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/alternate_half_padding"
-        android:paddingLeft="@dimen/standard_padding"
-        android:paddingStart="@dimen/standard_padding"
-        android:paddingRight="@dimen/zero"
-        android:paddingEnd="@dimen/zero"
-        android:paddingTop="@dimen/alternate_half_padding">
+        android:layout_alignBottom="@+id/buttonBar"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignTop="@+id/buttonBar"
+        android:layout_toLeftOf="@+id/buttonBar"
+        android:layout_toStartOf="@+id/buttonBar"
+        tools:ignore="UseCompoundDrawables">
 
 
-        <LinearLayout
-            android:id="@+id/title_container"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/buttonBar"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignTop="@+id/buttonBar"
-            android:layout_toLeftOf="@+id/buttonBar"
-            android:layout_toStartOf="@+id/buttonBar">
+        <ImageView
+            android:id="@+id/type"
+            android:layout_width="@dimen/synced_folders_item_type_layout_width"
+            android:layout_height="@dimen/synced_folders_item_type_layout_height"
+            android:layout_gravity="start|center_vertical"
+            android:layout_marginEnd="@dimen/synced_folders_item_type_layout_right_end_margin"
+            android:layout_marginRight="@dimen/synced_folders_item_type_layout_right_end_margin"
+            android:contentDescription="@string/synced_folders_type"
+            android:src="@drawable/image_32dp" />
 
 
-            <ImageView
-                android:id="@+id/type"
-                android:layout_width="@dimen/synced_folders_item_type_layout_width"
-                android:layout_height="@dimen/synced_folders_item_type_layout_height"
-                android:layout_gravity="start|center_vertical"
-                android:layout_marginRight="@dimen/synced_folders_item_type_layout_right_end_margin"
-                android:layout_marginEnd="@dimen/synced_folders_item_type_layout_right_end_margin"
-                android:src="@drawable/image_32dp"
-                android:contentDescription="@string/synced_folders_type"/>
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:ellipsize="middle"
+            android:text="@string/placeholder_filename"
+            android:textColor="?android:textColorPrimary"
+            android:textStyle="bold" />
 
 
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="start|center_vertical"
-                android:ellipsize="middle"
-                android:text="@string/placeholder_filename"
-                android:textColor="?android:textColorPrimary"
-                android:textStyle="bold"/>
+    </LinearLayout>
 
 
-        </LinearLayout>
+    <LinearLayout
+        android:id="@+id/buttonBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true">
 
 
-        <LinearLayout
-            android:id="@+id/buttonBar"
+        <ImageButton
+            android:id="@+id/syncStatusButton"
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true">
+            android:background="@color/transparent"
+            android:clickable="true"
+            android:contentDescription="@string/sync_status_button"
+            android:focusable="true"
+            android:padding="@dimen/standard_half_padding"
+            android:src="@drawable/ic_cloud_sync_off" />
 
 
-            <ImageButton
-                android:id="@+id/syncStatusButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@color/transparent"
-                android:clickable="true"
-                android:padding="@dimen/standard_half_padding"
-                android:src="@drawable/ic_cloud_sync_off"
-                android:contentDescription="@string/sync_status_button"
-                android:focusable="true"/>
-
-            <ImageButton
-                android:id="@+id/settingsButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@color/transparent"
-                android:clickable="true"
-                android:paddingBottom="@dimen/standard_half_padding"
-                android:paddingLeft="@dimen/standard_half_padding"
-                android:paddingStart="@dimen/standard_half_padding"
-                android:paddingRight="@dimen/standard_padding"
-                android:paddingEnd="@dimen/standard_padding"
-                android:paddingTop="@dimen/standard_half_padding"
-                android:src="@drawable/ic_dots_vertical"
-                android:contentDescription="@string/synced_folder_settings_button"
-                android:focusable="true"/>
-        </LinearLayout>
-    </RelativeLayout>
-
-</RelativeLayout>
+        <ImageButton
+            android:id="@+id/settingsButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/transparent"
+            android:clickable="true"
+            android:contentDescription="@string/synced_folder_settings_button"
+            android:focusable="true"
+            android:paddingBottom="@dimen/standard_half_padding"
+            android:paddingEnd="@dimen/standard_padding"
+            android:paddingLeft="@dimen/standard_half_padding"
+            android:paddingRight="@dimen/standard_padding"
+            android:paddingStart="@dimen/standard_half_padding"
+            android:paddingTop="@dimen/standard_half_padding"
+            android:src="@drawable/ic_dots_vertical" />
+    </LinearLayout>
+</RelativeLayout>

+ 1 - 1
src/main/res/layout/toolbar_user_information.xml

@@ -71,7 +71,7 @@
                         android:layout_width="@dimen/nav_drawer_header_avatar"
                         android:layout_width="@dimen/nav_drawer_header_avatar"
                         android:layout_height="@dimen/nav_drawer_header_avatar"
                         android:layout_height="@dimen/nav_drawer_header_avatar"
                         android:contentDescription="@string/avatar"
                         android:contentDescription="@string/avatar"
-                        android:src="@drawable/ic_account_circle"/>
+                        android:src="@drawable/account_circle_white"/>
                 </FrameLayout>
                 </FrameLayout>
 
 
                 <LinearLayout
                 <LinearLayout

+ 1 - 0
src/main/res/layout/upload_list_item.xml

@@ -24,6 +24,7 @@
     android:id="@+id/upload_list_item_layout"
     android:id="@+id/upload_list_item_layout"
     android:layout_width="match_parent"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_height="wrap_content"
+    android:baselineAligned="false"
     android:orientation="horizontal"
     android:orientation="horizontal"
     android:paddingBottom="@dimen/standard_half_padding"
     android:paddingBottom="@dimen/standard_half_padding"
     android:paddingTop="@dimen/standard_half_padding">
     android:paddingTop="@dimen/standard_half_padding">

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

@@ -754,7 +754,6 @@
     <string name="end_to_end_encryption_storing_keys">Storing keys</string>
     <string name="end_to_end_encryption_storing_keys">Storing keys</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Copy/move into encrypted folder currently not supported.</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Copy/move into encrypted folder currently not supported.</string>
     <string name="untrusted_domain">Access through untrusted domain. Please see documentation for further info.</string>
     <string name="untrusted_domain">Access through untrusted domain. Please see documentation for further info.</string>
-    <string name="upload_list_loading">Loading uploads…</string>
     <string name="notification_channel_push_name">Push notifications</string>
     <string name="notification_channel_push_name">Push notifications</string>
     <string name="notification_channel_push_description">Show push notifications sent by the server: Mentions in comments, reception of new remote shares, announcements posted by an admin etc.</string>
     <string name="notification_channel_push_description">Show push notifications sent by the server: Mentions in comments, reception of new remote shares, announcements posted by an admin etc.</string>
     <string name="sendbutton_description">Send button icon</string>
     <string name="sendbutton_description">Send button icon</string>

+ 0 - 1
src/main/res/values-de/strings.xml

@@ -754,7 +754,6 @@
     <string name="end_to_end_encryption_storing_keys">Schlüssel speichern</string>
     <string name="end_to_end_encryption_storing_keys">Schlüssel speichern</string>
     <string name="copy_move_to_encrypted_folder_not_supported">In verschlüsselten Ordner kopieren/verschieben wird aktuell nicht unterstützt.</string>
     <string name="copy_move_to_encrypted_folder_not_supported">In verschlüsselten Ordner kopieren/verschieben wird aktuell nicht unterstützt.</string>
     <string name="untrusted_domain">Zugriff über nicht vertrauenswürdige Domain. Weitere Informationen finden sich in der Dokumentation.</string>
     <string name="untrusted_domain">Zugriff über nicht vertrauenswürdige Domain. Weitere Informationen finden sich in der Dokumentation.</string>
-    <string name="upload_list_loading">Hochgeladenes wird geladen…</string>
     <string name="notification_channel_push_name">Push-Benachrichtigungen</string>
     <string name="notification_channel_push_name">Push-Benachrichtigungen</string>
     <string name="notification_channel_push_description">Vom Server gesendete Push-Benachrichtigungen anzeigen: Erwähnungen in Kommentaren, Zugriff auf weitere Freigaben erhalten, Ankündigungen von Administratoren erhalten, etc.</string>
     <string name="notification_channel_push_description">Vom Server gesendete Push-Benachrichtigungen anzeigen: Erwähnungen in Kommentaren, Zugriff auf weitere Freigaben erhalten, Ankündigungen von Administratoren erhalten, etc.</string>
     <string name="sendbutton_description">Icon für den Senden-Button</string>
     <string name="sendbutton_description">Icon für den Senden-Button</string>

+ 0 - 1
src/main/res/values-es/strings.xml

@@ -754,7 +754,6 @@
     <string name="end_to_end_encryption_storing_keys">Almacenando claves</string>
     <string name="end_to_end_encryption_storing_keys">Almacenando claves</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Copiar/mover en la carpeta cifrada no está actualmente soportado.</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Copiar/mover en la carpeta cifrada no está actualmente soportado.</string>
     <string name="untrusted_domain">Acceder a través de un domino no confiado. Por favor, mira la documentación para más información.</string>
     <string name="untrusted_domain">Acceder a través de un domino no confiado. Por favor, mira la documentación para más información.</string>
-    <string name="upload_list_loading">Cargando subidas…</string>
     <string name="notification_channel_push_name">Notificaciones de tipo push</string>
     <string name="notification_channel_push_name">Notificaciones de tipo push</string>
     <string name="notification_channel_push_description">Muestra notificaciones push enviadas por el servidor: menciones en comentarios, recepción de nuevos archivos  compartidos remotos, anuncios publicados por un administrador, etc.</string>
     <string name="notification_channel_push_description">Muestra notificaciones push enviadas por el servidor: menciones en comentarios, recepción de nuevos archivos  compartidos remotos, anuncios publicados por un administrador, etc.</string>
     <string name="sendbutton_description">Icono del botón de enviar</string>
     <string name="sendbutton_description">Icono del botón de enviar</string>

+ 0 - 1
src/main/res/values-fr/strings.xml

@@ -757,7 +757,6 @@ Veuillez contacter votre administrateur</string>
     <string name="end_to_end_encryption_storing_keys">Enregistrement des clés</string>
     <string name="end_to_end_encryption_storing_keys">Enregistrement des clés</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Copier/déplacer dans ce dossier chiffré n\'est pas actuellement supporté</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Copier/déplacer dans ce dossier chiffré n\'est pas actuellement supporté</string>
     <string name="untrusted_domain">Accès depuis un domaine non fiable. Veuillez consulter la documentation pour plus d\'informations.</string>
     <string name="untrusted_domain">Accès depuis un domaine non fiable. Veuillez consulter la documentation pour plus d\'informations.</string>
-    <string name="upload_list_loading">Chargement des téléversements…</string>
     <string name="notification_channel_push_name">Notifications push</string>
     <string name="notification_channel_push_name">Notifications push</string>
     <string name="notification_channel_push_description">Afficher les notifications push envoyées par le serveur : mentions dans les commentaires, réception d\'un nouveau partage distant, une annonce postée par un administrateur, etc.</string>
     <string name="notification_channel_push_description">Afficher les notifications push envoyées par le serveur : mentions dans les commentaires, réception d\'un nouveau partage distant, une annonce postée par un administrateur, etc.</string>
     <string name="sendbutton_description">Icône du bouton d\'envoi</string>
     <string name="sendbutton_description">Icône du bouton d\'envoi</string>

+ 0 - 1
src/main/res/values-hu-rHU/strings.xml

@@ -775,7 +775,6 @@ A Nextcloud itt érhető el: https://nextcloud.com</string>
     <string name="end_to_end_encryption_storing_keys">Kulcsok eltárolása</string>
     <string name="end_to_end_encryption_storing_keys">Kulcsok eltárolása</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Másolás/mozgatás titkosított mappába jelenleg nem támogatott.</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Másolás/mozgatás titkosított mappába jelenleg nem támogatott.</string>
     <string name="untrusted_domain">Nem megbízható domainen keresztüli elérés. Kérlek nézd meg a dokumentációt a részletekért.</string>
     <string name="untrusted_domain">Nem megbízható domainen keresztüli elérés. Kérlek nézd meg a dokumentációt a részletekért.</string>
-    <string name="upload_list_loading">Feltöltések betöltése…</string>
     <string name="notification_channel_push_name">Azonnali értesítések</string>
     <string name="notification_channel_push_name">Azonnali értesítések</string>
     <string name="notification_channel_push_description">A kiszolgáló által küldött üzenetek megjelenítése: Említések a megjegyzésekben, új távoli megosztások érkezése, adminisztrátori bejelentések, stb.</string>
     <string name="notification_channel_push_description">A kiszolgáló által küldött üzenetek megjelenítése: Említések a megjegyzésekben, új távoli megosztások érkezése, adminisztrátori bejelentések, stb.</string>
     <string name="sendbutton_description">Küldés gomb ikon</string>
     <string name="sendbutton_description">Küldés gomb ikon</string>

+ 0 - 1
src/main/res/values-it/strings.xml

@@ -754,7 +754,6 @@
     <string name="end_to_end_encryption_storing_keys">Archiviazione chiavi</string>
     <string name="end_to_end_encryption_storing_keys">Archiviazione chiavi</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Copia/Spostamento in una cartella cifrata attualmente non supportati.</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Copia/Spostamento in una cartella cifrata attualmente non supportati.</string>
     <string name="untrusted_domain">Accesso tramite un dominio non fidato. Vedi la documentazione per ulteriori informazioni.</string>
     <string name="untrusted_domain">Accesso tramite un dominio non fidato. Vedi la documentazione per ulteriori informazioni.</string>
-    <string name="upload_list_loading">Caricamento file inviati…</string>
     <string name="notification_channel_push_name">Notifiche push</string>
     <string name="notification_channel_push_name">Notifiche push</string>
     <string name="notification_channel_push_description">Mostra le notifiche push inviate dal server: menzioni nei commenti, ricezione di nuove condivisioni remote, annunci pubblicati da un amministratore ecc.</string>
     <string name="notification_channel_push_description">Mostra le notifiche push inviate dal server: menzioni nei commenti, ricezione di nuove condivisioni remote, annunci pubblicati da un amministratore ecc.</string>
     <string name="sendbutton_description">Icona pulsante di invio</string>
     <string name="sendbutton_description">Icona pulsante di invio</string>

+ 0 - 1
src/main/res/values-nl/strings.xml

@@ -754,7 +754,6 @@
     <string name="end_to_end_encryption_storing_keys">Opslaan sleutels</string>
     <string name="end_to_end_encryption_storing_keys">Opslaan sleutels</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Kopieren/verplaatsen naar een versleutelde map is momenteel niet mogelijk.</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Kopieren/verplaatsen naar een versleutelde map is momenteel niet mogelijk.</string>
     <string name="untrusted_domain">Toegang van een niet vertrouwd domein. Bekijk de documentatie voor meer informatie.</string>
     <string name="untrusted_domain">Toegang van een niet vertrouwd domein. Bekijk de documentatie voor meer informatie.</string>
-    <string name="upload_list_loading">Uploads laden…</string>
     <string name="notification_channel_push_name">Push meldingen</string>
     <string name="notification_channel_push_name">Push meldingen</string>
     <string name="notification_channel_push_description">Toon push meldingen verstuurd door de server: als je wordt vermeld in reacties, of als je een deellink ontvangt of als een beheerder een aankondiging plaatst.</string>
     <string name="notification_channel_push_description">Toon push meldingen verstuurd door de server: als je wordt vermeld in reacties, of als je een deellink ontvangt of als een beheerder een aankondiging plaatst.</string>
     <string name="sendbutton_description">Verstuur-knop pictogram</string>
     <string name="sendbutton_description">Verstuur-knop pictogram</string>

+ 0 - 1
src/main/res/values-pt-rBR/strings.xml

@@ -754,7 +754,6 @@
     <string name="end_to_end_encryption_storing_keys">Armazenando chaves</string>
     <string name="end_to_end_encryption_storing_keys">Armazenando chaves</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Copia e movimentação para a pasta criptografada atualmente não são suportadas.</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Copia e movimentação para a pasta criptografada atualmente não são suportadas.</string>
     <string name="untrusted_domain">Acesso através de domínio não confiável. Veja a documentação para mais informações.</string>
     <string name="untrusted_domain">Acesso através de domínio não confiável. Veja a documentação para mais informações.</string>
-    <string name="upload_list_loading">Carregando envios...</string>
     <string name="notification_channel_push_name">Notificações push</string>
     <string name="notification_channel_push_name">Notificações push</string>
     <string name="notification_channel_push_description">Mostrar notificações push enviadas pelo servidor: Menções nos comentários, recepção de novos compartilhamentos remotos, anúncios postados pelo administrador etc.</string>
     <string name="notification_channel_push_description">Mostrar notificações push enviadas pelo servidor: Menções nos comentários, recepção de novos compartilhamentos remotos, anúncios postados pelo administrador etc.</string>
     <string name="sendbutton_description">Ícone do botão Enviar</string>
     <string name="sendbutton_description">Ícone do botão Enviar</string>

+ 0 - 1
src/main/res/values-ru/strings.xml

@@ -764,7 +764,6 @@
     <string name="end_to_end_encryption_storing_keys">Сохранение ключей</string>
     <string name="end_to_end_encryption_storing_keys">Сохранение ключей</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Копирование и перемещение в зашифрованные папки пока не поддерживается.</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Копирование и перемещение в зашифрованные папки пока не поддерживается.</string>
     <string name="untrusted_domain">Доступ через недоверенный домен. За дополнительной информацией обратитесь к документации.</string>
     <string name="untrusted_domain">Доступ через недоверенный домен. За дополнительной информацией обратитесь к документации.</string>
-    <string name="upload_list_loading">Загрузка списка передаваемых файлов…</string>
     <string name="notification_channel_push_name">Push-уведомления</string>
     <string name="notification_channel_push_name">Push-уведомления</string>
     <string name="notification_channel_push_description">Показывать push-уведомления, отправляемые на сервер: упоминания в комментариях, прием новых общих ресурсов, объявления, размещаемые администратором и т.д.</string>
     <string name="notification_channel_push_description">Показывать push-уведомления, отправляемые на сервер: упоминания в комментариях, прием новых общих ресурсов, объявления, размещаемые администратором и т.д.</string>
     <string name="sendbutton_description">Значок кнопки «отправить»</string>
     <string name="sendbutton_description">Значок кнопки «отправить»</string>

+ 0 - 1
src/main/res/values-sr/strings.xml

@@ -759,7 +759,6 @@
     <string name="end_to_end_encryption_storing_keys">Складиштење кључева</string>
     <string name="end_to_end_encryption_storing_keys">Складиштење кључева</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Копирање/премештање у шифровану фасциклу није подржано.</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Копирање/премештање у шифровану фасциклу није подржано.</string>
     <string name="untrusted_domain">Приступ кроз домен који није од поверења. Погледајте документацију за још информација.</string>
     <string name="untrusted_domain">Приступ кроз домен који није од поверења. Погледајте документацију за још информација.</string>
-    <string name="upload_list_loading">Учитавам отпремања…</string>
     <string name="notification_channel_push_name">Брза обавештења</string>
     <string name="notification_channel_push_name">Брза обавештења</string>
     <string name="notification_channel_push_description">Приказуј брза обавештења која пошаље сервер: када сте поменути у коментарима, када добијете ново удаљено дељење, када администратор постави неко обавештење итд.</string>
     <string name="notification_channel_push_description">Приказуј брза обавештења која пошаље сервер: када сте поменути у коментарима, када добијете ново удаљено дељење, када администратор постави неко обавештење итд.</string>
     <string name="sendbutton_description">Икона дугма за слање</string>
     <string name="sendbutton_description">Икона дугма за слање</string>

+ 0 - 1
src/main/res/values-tr/strings.xml

@@ -754,7 +754,6 @@
     <string name="end_to_end_encryption_storing_keys">Anahtarlar kaydediliyor</string>
     <string name="end_to_end_encryption_storing_keys">Anahtarlar kaydediliyor</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Şifrelenmiş bir klasöre kopyalama ve taşıma işlemleri henüz desteklenmiyor.</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Şifrelenmiş bir klasöre kopyalama ve taşıma işlemleri henüz desteklenmiyor.</string>
     <string name="untrusted_domain">Güvenilmeyen bir etki alanı üzerinden erişiliyor. Lütfen ayrıntılı bilgi almak için belgelere bakın.</string>
     <string name="untrusted_domain">Güvenilmeyen bir etki alanı üzerinden erişiliyor. Lütfen ayrıntılı bilgi almak için belgelere bakın.</string>
-    <string name="upload_list_loading">Yüklemeler yapılıyor…</string>
     <string name="notification_channel_push_name">Anında bildirimler</string>
     <string name="notification_channel_push_name">Anında bildirimler</string>
     <string name="notification_channel_push_description">Yorumlarda anılmanız, yeni bir uzak paylaşım almanız ya da bir yönetici tarafından bir duyuru yapıması gibi durumlarda sunucu tarafından gönderilen anında bildirimler görüntülenir.</string>
     <string name="notification_channel_push_description">Yorumlarda anılmanız, yeni bir uzak paylaşım almanız ya da bir yönetici tarafından bir duyuru yapıması gibi durumlarda sunucu tarafından gönderilen anında bildirimler görüntülenir.</string>
     <string name="sendbutton_description">Gönderme düğmesi simgesi</string>
     <string name="sendbutton_description">Gönderme düğmesi simgesi</string>

+ 0 - 1
src/main/res/values/strings.xml

@@ -771,7 +771,6 @@
     <string name="end_to_end_encryption_storing_keys">Storing keys</string>
     <string name="end_to_end_encryption_storing_keys">Storing keys</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Copy/move into encrypted folder currently not supported.</string>
     <string name="copy_move_to_encrypted_folder_not_supported">Copy/move into encrypted folder currently not supported.</string>
     <string name="untrusted_domain">Access through untrusted domain. Please see documentation for further info.</string>
     <string name="untrusted_domain">Access through untrusted domain. Please see documentation for further info.</string>
-    <string name="upload_list_loading">Loading uploads…</string>
     <string name="notification_channel_push_name">Push notifications</string>
     <string name="notification_channel_push_name">Push notifications</string>
     <string name="notification_channel_push_description">Show push notifications sent by the server: Mentions in comments, reception of new remote shares, announcements posted by an admin etc.</string>
     <string name="notification_channel_push_description">Show push notifications sent by the server: Mentions in comments, reception of new remote shares, announcements posted by an admin etc.</string>
     <string name="sendbutton_description">Send button icon</string>
     <string name="sendbutton_description">Send button icon</string>