mirror of
https://github.com/nextcloud/android.git
synced 2024-12-20 16:02:01 +03:00
Merge remote-tracking branch 'origin/master' into dev
This commit is contained in:
commit
11fc9875d7
1 changed files with 0 additions and 2 deletions
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue