Skip to content

Commit b67fe1c

Browse files
authored
Merge pull request #68 from kaczmarkiewiczp/dev
Updates and fixes
2 parents e5a3c2c + f19cb3a commit b67fe1c

File tree

2 files changed

+57
-7
lines changed

2 files changed

+57
-7
lines changed

app/src/main/java/ca/pkay/rcloneexplorer/SharingActivity.java

+14-7
Original file line numberDiff line numberDiff line change
@@ -244,14 +244,21 @@ private class CopyFile extends AsyncTask<Void, Void, Boolean> {
244244
@Override
245245
protected Boolean doInBackground(Void... voids) {
246246
for (Uri uri : uris) {
247-
Cursor returnCursor = getContentResolver().query(uri, null, null, null, null);
248-
if (returnCursor == null) {
249-
return false;
247+
String fileName;
248+
if (uri.getScheme().equals("content")) {
249+
Cursor returnCursor = getContentResolver().query(uri, null, null, null, null);
250+
if (returnCursor == null) {
251+
return false;
252+
}
253+
int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
254+
returnCursor.moveToFirst();
255+
fileName = returnCursor.getString(nameIndex);
256+
returnCursor.close();
257+
} else {
258+
fileName = uri.getPath();
259+
int index = fileName.lastIndexOf("/");
260+
fileName = fileName.substring(index + 1);
250261
}
251-
int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
252-
returnCursor.moveToFirst();
253-
String fileName = returnCursor.getString(nameIndex);
254-
returnCursor.close();
255262

256263
File cacheDir = getExternalCacheDir();
257264
InputStream inputStream;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<android.support.design.widget.CoordinatorLayout
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
xmlns:app="http://schemas.android.com/apk/res-auto"
7+
xmlns:tools="http://schemas.android.com/tools"
8+
android:orientation="vertical"
9+
android:background="?attr/backgroundColor" >
10+
11+
<include
12+
layout="@layout/empty_directory_state" />
13+
14+
<android.support.v4.widget.SwipeRefreshLayout
15+
android:id="@+id/swipe_refresh_layout"
16+
android:layout_width="600dp"
17+
android:layout_height="match_parent"
18+
android:layout_gravity="center_horizontal"
19+
android:layout_above="@+id/bottom_bar" >
20+
21+
<android.support.v7.widget.RecyclerView
22+
android:layout_width="match_parent"
23+
android:layout_height="match_parent"
24+
android:id="@+id/recycler_view"
25+
android:clipToPadding="false"
26+
android:paddingBottom="54dp"
27+
app:layoutManager="LinearLayoutManager"
28+
tools:listitem="@layout/fragment_file_explorer_item" />
29+
</android.support.v4.widget.SwipeRefreshLayout>
30+
31+
<include
32+
android:id="@+id/move_bar"
33+
android:layout_width="600dp"
34+
android:layout_height="56dp"
35+
android:orientation="horizontal"
36+
android:layout_gravity="bottom|center"
37+
android:background="@color/colorPrimary"
38+
android:elevation="8dp"
39+
android:visibility="gone"
40+
android:clickable="true"
41+
android:focusable="true"
42+
layout="@layout/move_bar"/>
43+
</android.support.design.widget.CoordinatorLayout>

0 commit comments

Comments
 (0)