Folder icon for AutoUpload folder.

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

app/src/androidTest/java/com/nmc/android/ui/SyncedFoldersActivityIT.kt

@@ -1,58 +0,0 @@
-package com.nmc.android.ui
-
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.UiController
-import androidx.test.espresso.ViewAction
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.contrib.RecyclerViewActions
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.rules.ActivityScenarioRule
-import androidx.test.platform.app.InstrumentationRegistry
-import com.owncloud.android.AbstractIT
-import com.owncloud.android.R
-import com.owncloud.android.ui.activity.SyncedFoldersActivity
-import org.hamcrest.Matcher
-import org.hamcrest.Matchers.startsWith
-import org.junit.Rule
-import org.junit.Test
-
-class SyncedFoldersActivityIT : AbstractIT() {
-
-    @get:Rule
-    val activityRule = ActivityScenarioRule(SyncedFoldersActivity::class.java)
-
-    @Test
-    fun syncedFolderDialogWithCameraMediaPath() {
-        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
-        shortSleep()
-
-        onView(withId(android.R.id.list))
-            .perform(RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(0, object : ViewAction {
-
-                override fun getDescription(): String {
-                    return "Click on specific button"
-                }
-
-                override fun getConstraints(): Matcher<View>? {
-                    return null
-                }
-
-                override fun perform(uiController: UiController, view: View) {
-                    val button = view.findViewById<View>(R.id.settingsButton)
-                    button.performClick()
-                }
-            }))
-
-        onView(withText("Configure")).perform(click())
-
-        onView(withId(R.id.remote_folder_summary)).check(matches(withText(startsWith(AUTO_UPLOAD_PATH))))
-    }
-
-    companion object {
-        const val AUTO_UPLOAD_PATH = "/Camera-Media/"
-    }
-}

app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -41,7 +41,6 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.account.UserAccountManager;
-import com.nextcloud.client.core.Clock;
 import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.jobs.BackgroundJobManager;
 import com.nextcloud.client.network.ClientFactory;
@@ -54,7 +53,6 @@ import com.owncloud.android.R;
 import com.owncloud.android.databinding.FileDetailsFragmentBinding;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.datamodel.SyncedFolderProvider;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
@@ -108,7 +106,6 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
     private View view;
     private User user;
     private OCFile parentFolder;
-    private SyncedFolderProvider syncedFolderProvider;
     private boolean previewLoaded;
 
     private FileDetailsFragmentBinding binding;
@@ -123,7 +120,6 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
     @Inject FileDataStorageManager storageManager;
     @Inject ViewThemeUtils viewThemeUtils;
     @Inject BackgroundJobManager backgroundJobManager;
-    @Inject Clock clock;
 
     /**
      * Public factory method to create new FileDetailFragment instances.
@@ -212,8 +208,6 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
             throw new IllegalArgumentException("Arguments may not be null");
         }
 
-        syncedFolderProvider =new SyncedFolderProvider(requireActivity().getContentResolver(), preferences, clock);
-
         setFile(arguments.getParcelable(ARG_FILE));
         parentFolder = arguments.getParcelable(ARG_PARENT_FOLDER);
         user = arguments.getParcelable(ARG_USER);

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

@@ -411,7 +411,7 @@
     <string name="in_folder">in Ordner %1$s</string>
     <string name="instant_upload_existing">Vorhandene Dateien ebenfalls hochladen</string>
     <string name="instant_upload_on_charging">Nur während des Ladens der Batterie hochladen</string>
-    <string name="instant_upload_path">/Kamera-Medien</string>
+    <string name="instant_upload_path">/SofortUpload</string>
     <string name="invalid_url">Ungültige URL</string>
     <string name="invisible">Unsichtbar</string>
     <string name="label_empty">Bezeichnung darf nicht leer sein</string>

app/src/main/res/values/strings.xml

@@ -340,7 +340,7 @@
     <string name="auto_upload_on_wifi">Only upload on unmetered Wi-Fi</string>
     <string name="instant_upload_on_charging">Only upload when charging</string>
     <string name="instant_upload_existing">Also upload existing files</string>
-    <string name="instant_upload_path">/Camera-Media</string>
+    <string name="instant_upload_path">/InstantUpload</string>
     <string name="auto_upload_path">/AutoUpload</string>
 
     <string name="preview_sorry">Sorry</string>