bug fix commons-app#1854 wip

Author: ashishkumar468

app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java

@@ -272,6 +272,9 @@ private static boolean isMediaDocument(Uri uri) {
      * Check if the URI is owned by the current app.
      */
     public static boolean isSelfOwned(Context context, Uri uri) {
+        if(null == uri.getAuthority()){
+            return false;
+        }
         return uri.getAuthority().equals(context.getPackageName() + ".provider");
     }
 

app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java

@@ -11,13 +11,15 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
+import android.provider.MediaStore;
 import android.support.annotation.NonNull;
 import android.support.annotation.RequiresApi;
 import android.support.design.widget.FloatingActionButton;
@@ -35,6 +37,7 @@
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.github.chrisbanes.photoview.PhotoView;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -125,7 +128,6 @@ public class ShareActivity
     private String mimeType;
     private CategorizationFragment categorizationFragment;
     private Uri mediaUri;
-    private Uri contentProviderUri;
     private Contribution contribution;
     private GPSExtractor gpsObj;
     private String decimalCoords;
@@ -214,7 +216,7 @@ private void uploadBegins() {
             Timber.d("Cache the categories found");
         }
 
-        uploadController.startUpload(title, contentProviderUri, mediaUri, description, mimeType, source, decimalCoords, wikiDataEntityId, c -> {
+        uploadController.startUpload(title,mediaUri, description, mimeType, source, decimalCoords, wikiDataEntityId, c -> {
             ShareActivity.this.contribution = c;
             showPostUpload();
         });
@@ -354,9 +356,12 @@ private void receiveImageIntent() {
 
         if (Intent.ACTION_SEND.equals(intent.getAction())) {
             mediaUri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-            contentProviderUri = mediaUri;
-            mediaUri = ContributionUtils.saveFileBeingUploadedTemporarily(this, mediaUri);
-
+            String imageFilePath = getImageFilePath(mediaUri);
+            if(imageFilePath==null){
+                //TODO handle this properly
+                return;
+            }
+            mediaUri=Uri.parse(imageFilePath);
             if (intent.hasExtra(UploadService.EXTRA_SOURCE)) {
                 source = intent.getStringExtra(UploadService.EXTRA_SOURCE);
             } else {
@@ -379,6 +384,26 @@ private void receiveImageIntent() {
         }
     }
 
+    public String getImageFilePath(Uri uri) {
+        String path = null, image_id = null;
+
+        Cursor cursor1 = getContentResolver().query(uri, null, null, null, null);
+        if (cursor1 != null) {
+            cursor1.moveToFirst();
+            image_id = cursor1.getString(0);
+            image_id = image_id.substring(image_id.lastIndexOf(":") + 1);
+            cursor1.close();
+        }
+
+        Cursor cursor = getContentResolver().query(android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI, null, MediaStore.Images.Media._ID + " = ? ", new String[]{image_id}, null);
+        if (cursor!=null) {
+            cursor.moveToFirst();
+            path = cursor.getString(cursor.getColumnIndex(MediaStore.Images.Media.DATA));
+            cursor.close();
+        }
+        return path;
+    }
+
     /**
      * Function to display the zoom and map FAB
      */

app/src/main/java/fr/free/nrw/commons/upload/UploadController.java

@@ -96,38 +96,29 @@ public void cleanup() {
      * @param wikiDataEntityId
      * @param onComplete    the progress tracker
      */
-    public void startUpload(String title, Uri contentProviderUri, Uri mediaUri, String description, String mimeType, String source, String decimalCoords, String wikiDataEntityId, ContributionUploadProgress onComplete) {
+    public void startUpload(String title, Uri mediaUri, String description, String mimeType, String source, String decimalCoords, String wikiDataEntityId, ContributionUploadProgress onComplete) {
         Contribution contribution;
-
-
-            //TODO: Modify this to include coords
-            contribution = new Contribution(mediaUri, null, title, description, -1,
-                    null, null, sessionManager.getCurrentAccount().name,
-                    CommonsApplication.DEFAULT_EDIT_SUMMARY, decimalCoords);
-
-
-            contribution.setTag("mimeType", mimeType);
-            contribution.setSource(source);
-
         Timber.d("Wikidata entity ID received from Share activity is %s", wikiDataEntityId);
-        //TODO: Modify this to include coords
         Account currentAccount = sessionManager.getCurrentAccount();
         if(currentAccount == null) {
             Timber.d("Current account is null");
             ViewUtil.showLongToast(context, context.getString(R.string.user_not_logged_in));
             sessionManager.forceLogin(context);
             return;
         }
+        String fileAbsolutePath = mediaUri.toString();
+        File file=new File(fileAbsolutePath);
+        long lastModified = file.lastModified();
+        Date lastModifiedDate=new Date(lastModified);
         contribution = new Contribution(mediaUri, null, title, description, -1,
-                null, null, currentAccount.name,
+                lastModifiedDate, new Date(System.currentTimeMillis()), currentAccount.name,
                 CommonsApplication.DEFAULT_EDIT_SUMMARY, decimalCoords);
 
 
         contribution.setTag("mimeType", mimeType);
         contribution.setSource(source);
         contribution.setWikiDataEntityId(wikiDataEntityId);
-        contribution.setContentProviderUri(contentProviderUri);
-
+        contribution.setContentProviderUri(mediaUri);
         //Calls the next overloaded method
         startUpload(contribution, onComplete);
     }
@@ -188,36 +179,14 @@ protected Contribution doInBackground(Void... voids /* stare into you */) {
                 }
 
                 String mimeType = (String) contribution.getTag("mimeType");
-                Boolean imagePrefix = false;
-
                 if (mimeType == null || TextUtils.isEmpty(mimeType) || mimeType.endsWith("*")) {
                     mimeType = contentResolver.getType(contribution.getLocalUri());
                 }
 
                 if (mimeType != null) {
                     contribution.setTag("mimeType", mimeType);
-                    imagePrefix = mimeType.startsWith("image/");
                     Timber.d("MimeType is: %s", mimeType);
                 }
-
-                if (imagePrefix && contribution.getDateCreated() == null) {
-                    Timber.d("local uri   " + contribution.getLocalUri());
-                    Cursor cursor = contentResolver.query(contribution.getLocalUri(),
-                            new String[]{MediaStore.Images.ImageColumns.DATE_TAKEN}, null, null, null);
-                    if (cursor != null && cursor.getCount() != 0 && cursor.getColumnCount() != 0) {
-                        cursor.moveToFirst();
-                        Date dateCreated = new Date(cursor.getLong(0));
-                        Date epochStart = new Date(0);
-                        if (dateCreated.equals(epochStart) || dateCreated.before(epochStart)) {
-                            // If date is incorrect (1st second of unix time) then set it to the current date
-                            dateCreated = new Date();
-                        }
-                        contribution.setDateCreated(dateCreated);
-                        cursor.close();
-                    } else {
-                        contribution.setDateCreated(new Date());
-                    }
-                }
             return contribution;
             }