Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
Tobias Kaminsky 2023-12-21 02:31:07 +01:00
commit 11fc9875d7

View file

@ -73,7 +73,6 @@ import com.nextcloud.client.utils.IntentUtil;
import com.nextcloud.java.util.Optional; import com.nextcloud.java.util.Optional;
import com.nextcloud.utils.extensions.BundleExtensionsKt; import com.nextcloud.utils.extensions.BundleExtensionsKt;
import com.nextcloud.utils.extensions.IntentExtensionsKt; import com.nextcloud.utils.extensions.IntentExtensionsKt;
import com.nextcloud.utils.extensions.BundleExtensionsKt;
import com.nextcloud.utils.view.FastScrollUtils; import com.nextcloud.utils.view.FastScrollUtils;
import com.owncloud.android.MainApp; import com.owncloud.android.MainApp;
import com.owncloud.android.R; import com.owncloud.android.R;
@ -1086,7 +1085,6 @@ public class FileDisplayActivity extends FileActivity implements FileFragment.Co
startFile = fileArgs; startFile = fileArgs;
setFile(startFile); setFile(startFile);
} }
setFile(startFile);
} }
// refresh list of files // refresh list of files