Merge pull request #58 from mirisbowring/Fix-#31

Implemented parser to retrieve displayname for files/content

Author: eikek

app/src/main/java/org/docspell/docspellshare/activity/ShareActivity.java

@@ -2,14 +2,18 @@
 
 import android.content.ContentResolver;
 import android.content.Intent;
+import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.provider.MediaStore;
+import android.provider.OpenableColumns;
 import android.util.Log;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+
 import java.util.Collections;
 import java.util.List;
 import org.docspell.docspellshare.R;
@@ -128,8 +132,53 @@ void handleFiles(List<Uri> uris, String url) {
     HttpRequest.Builder req = HttpRequest.newBuilder().setUrl(url);
     ContentResolver resolver = getContentResolver();
     for (Uri uri : uris) {
-      req.addFile(resolver, uri);
+        req.addFile(resolver, uri, parseFilenameFromUri(uri));
     }
     UploadManager.getInstance().submit(req.build());
   }
+
+    /**
+     * Parses the filename for the passed uri.
+     * Depending on the source application, a file:// or content:// will be shared.
+     * If a file:// is shared, the filename/title is the last segment of the uri.
+     * IF NOT, the last segment of the uri is the android document id which is not related to the
+     * document at all.
+     * Therefore, a cursor has to be defined to read the content's metadata to obtain the name/title
+     *
+     * See https://developer.android.com/training/secure-file-sharing/retrieve-info?hl=en for ref
+     *
+     * @param uri link to content/file the name should be parsed from
+     * @return parsed "real" name of the content/file
+     */
+  private String parseFilenameFromUri(Uri uri) {
+    String fileName = null;
+    if (uri.getScheme().equals("file")) {
+        fileName = uri.getLastPathSegment();
+    } else {
+        Cursor cursor = null;
+        try {
+            cursor = getContentResolver().query(
+                    uri,
+                    new String[]{
+                            MediaStore.Images.ImageColumns.DISPLAY_NAME
+                    },
+                    null,
+                    null,
+                    null
+            );
+            if (cursor != null && cursor.moveToFirst()) {
+                fileName = cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME));
+            }
+        } catch (IllegalArgumentException e) {
+            // exception will be thrown if index is out of range (e.x. -1).
+            // No need to handle the exception since the HttpRequest Class will fallback to Document ID
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+    }
+    return fileName;
+  }
 }
+

app/src/main/java/org/docspell/docspellshare/http/HttpRequest.java

@@ -22,6 +22,7 @@
 import okio.Okio;
 import okio.Source;
 import org.docspell.docspellshare.data.Option;
+import org.docspell.docspellshare.util.Strings;
 import org.docspell.docspellshare.util.Uris;
 
 public final class HttpRequest {
@@ -68,7 +69,7 @@ public static class Builder {
     private final List<DataPart> parts = new ArrayList<>();
     private String url;
 
-    public Builder addFile(ContentResolver resolver, Uri data) {
+    public Builder addFile(ContentResolver resolver, Uri data, String fileName) {
       parts.add(
           new DataPart() {
             @Override
@@ -78,7 +79,11 @@ public InputStream getData() throws IOException {
 
             @Override
             public String getName() {
-              return data.getLastPathSegment();
+              if (Strings.isNullOrBlank(fileName)) {
+                return data.getLastPathSegment();
+              } else {
+                return fileName;
+              }
             }
 
             @Override
@@ -132,7 +137,7 @@ public long contentLength() {
       @Override
       public void writeTo(@NonNull BufferedSink sink) throws IOException {
         try (InputStream in = part.getData();
-            Source source = Okio.source(in)) {
+             Source source = Okio.source(in)) {
           long total = 0;
           long read;
           while ((read = source.read(sink.getBuffer(), CHUNK_SIZE)) != -1) {