Package structure: moved functionality from FileUtils to MarkerUtils.

Part of #963.

src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java

@@ -44,7 +44,6 @@ import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.Marker;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.MarkerEditBinding;
-import de.dennisguse.opentracks.util.IntentUtils;
 
 /**
  * An activity to add/edit a marker.
@@ -225,7 +224,7 @@ public class MarkerEditActivity extends AbstractActivity {
     }
 
     private void createMarkerWithPicture() {
-        Pair<Intent, Uri> intentAndPhotoUri = IntentUtils.createTakePictureIntent(this, getTrackId());
+        Pair<Intent, Uri> intentAndPhotoUri = MarkerUtils.createTakePictureIntent(this, getTrackId());
         cameraPhotoUri = intentAndPhotoUri.second;
         takePictureFromCamera.launch(intentAndPhotoUri.first);
     }

src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditViewModel.java

@@ -84,7 +84,7 @@ public class MarkerEditViewModel extends AndroidViewModel {
             return;
         }
 
-        File photoFile = FileUtils.getPhotoFileIfExists(getApplication(), markerData.getValue().getTrackId(), photoUri);
+        File photoFile = MarkerUtils.getPhotoFileIfExists(getApplication(), markerData.getValue().getTrackId(), photoUri);
         if (photoFile != null) {
             FileUtils.deleteDirectoryRecurse(photoFile);
         }
@@ -124,7 +124,7 @@ public class MarkerEditViewModel extends AndroidViewModel {
 
         try (ParcelFileDescriptor parcelFd = getApplication().getContentResolver().openFileDescriptor(srcUri, "r")) {
             FileDescriptor srcFd = parcelFd.getFileDescriptor();
-            File dstFile = new File(FileUtils.getImageUrl(getApplication(), marker.getTrackId()));
+            File dstFile = new File(MarkerUtils.getImageUrl(getApplication(), marker.getTrackId()));
             FileUtils.copy(srcFd, dstFile);
 
             Uri photoUri = FileUtils.getUriForFile(getApplication(), dstFile);

src/main/java/de/dennisguse/opentracks/ui/markers/MarkerUtils.java

@@ -1,16 +1,34 @@
 package de.dennisguse.opentracks.ui.markers;
 
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.provider.MediaStore;
+import android.util.Log;
+import android.util.Pair;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
+
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.util.FileUtils;
 
 public class MarkerUtils {
 
-    public static final int ICON_ID = R.drawable.ic_marker_orange_pushpin_with_shadow;
+    private static final String TAG = FileUtils.class.getSimpleName();
+
+    static final int ICON_ID = R.drawable.ic_marker_orange_pushpin_with_shadow;
+
+    private static final String JPEG_EXTENSION = "jpeg";
 
     private MarkerUtils() {
     }
@@ -18,4 +36,81 @@ public class MarkerUtils {
     public static Drawable getDefaultPhoto(@NonNull Context context) {
         return ContextCompat.getDrawable(context, ICON_ID);
     }
+
+    /**
+     * Sends a take picture request to the camera app.
+     * The picture is then stored in the track's folder.
+     *
+     * @param context the context
+     * @param trackId the track id
+     */
+    static Pair<Intent, Uri> createTakePictureIntent(Context context, Track.Id trackId) {
+        File dir = FileUtils.getPhotoDir(context, trackId);
+
+        String fileName = SimpleDateFormat.getDateTimeInstance().format(new Date());
+        File file = new File(dir, FileUtils.buildUniqueFileName(dir, fileName, JPEG_EXTENSION));
+
+        Uri photoUri = FileProvider.getUriForFile(context, FileUtils.FILEPROVIDER, file);
+        Log.d(TAG, "Taking photo to URI: " + photoUri);
+        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE)
+                .putExtra(MediaStore.EXTRA_OUTPUT, photoUri);
+        return new Pair<>(intent, photoUri);
+    }
+
+    @VisibleForTesting(otherwise = 3)
+    public static String getImageUrl(Context context, Track.Id trackId) {
+        File dir = FileUtils.getPhotoDir(context, trackId);
+
+        String fileName = SimpleDateFormat.getDateTimeInstance().format(new Date());
+        File file = new File(dir, FileUtils.buildUniqueFileName(dir, fileName, JPEG_EXTENSION));
+
+        return file.getAbsolutePath();
+    }
+
+    /**
+     * Checks that there is a file inside track photo directory whose name is the same that uri file.
+     * If there is a file inside photo directory whose name is the same that uri then returns File. Otherwise returns null.
+     *
+     * @param context the Context.
+     * @param trackId the id of the Track.
+     * @param uri     the uri to check.
+     * @return File object or null.
+     */
+    public static File getPhotoFileIfExists(Context context, Track.Id trackId, Uri uri) {
+        if (uri == null) {
+            Log.w(TAG, "URI object is null.");
+            return null;
+        }
+
+        String filename = uri.getLastPathSegment();
+        if (filename == null) {
+            Log.w(TAG, "External photo contains no filename.");
+            return null;
+        }
+
+        File dir = FileUtils.getPhotoDir(context, trackId);
+        File file = new File(dir, filename);
+        if (!file.exists()) {
+            return null;
+        }
+
+        return file;
+    }
+
+    @Nullable
+    public static File buildInternalPhotoFile(Context context, Track.Id trackId, @NonNull Uri fileNameUri) {
+        if (fileNameUri == null) {
+            Log.w(TAG, "URI object is null.");
+            return null;
+        }
+
+        String filename = fileNameUri.getLastPathSegment();
+        if (filename == null) {
+            Log.w(TAG, "External photo contains no filename.");
+            return null;
+        }
+
+        File dir = FileUtils.getPhotoDir(context, trackId);
+        return new File(dir, filename);
+    }
 }