diff --git a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java index f1d4e5962..602aed2f0 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java @@ -24,7 +24,6 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Bundle; import android.provider.MediaStore; -import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -36,13 +35,8 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.core.app.ActivityCompat; -import androidx.core.content.FileProvider; import androidx.viewpager.widget.ViewPager; -import java.io.File; -import java.text.SimpleDateFormat; -import java.util.Date; - import de.dennisguse.opentracks.content.ContentProviderUtils; import de.dennisguse.opentracks.content.Track; import de.dennisguse.opentracks.content.TrackDataHub; @@ -78,7 +72,6 @@ public class TrackDetailActivity extends AbstractTrackActivity implements Choose private static final String CURRENT_TAB_TAG_KEY = "current_tab_tag_key"; private static final String PHOTO_URI_KEY = "photo_uri_key"; private static final String HAS_PHOTO_KEY = "has_photo_key"; - private static final String JPEG_EXTENSION = "jpeg"; private static final int CAMERA_REQUEST_CODE = 5; private static final int EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE = 6; @@ -335,7 +328,7 @@ public class TrackDetailActivity extends AbstractTrackActivity implements Choose ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE); return false; } - takePicture(); + startActivityForResult(IntentUtils.createTakePictureIntent(this, trackId), CAMERA_REQUEST_CODE); return true; case R.id.track_detail_markers: intent = IntentUtils.newIntent(this, MarkerListActivity.class) @@ -367,27 +360,13 @@ public class TrackDetailActivity extends AbstractTrackActivity implements Choose } } - private void takePicture() { - File dir = FileUtils.getPhotoDir(trackId); - FileUtils.ensureDirectoryExists(dir); - - String fileName = SimpleDateFormat.getDateTimeInstance().format(new Date()); - File file = new File(dir, FileUtils.buildUniqueFileName(dir, fileName, JPEG_EXTENSION)); - - photoUri = FileProvider.getUriForFile(this, FileUtils.FILEPROVIDER, file); - Log.d(TAG, "Taking photo to URI: " + photoUri); - Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE) - .putExtra(MediaStore.EXTRA_OUTPUT, photoUri); - startActivityForResult(intent, CAMERA_REQUEST_CODE); - } - @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { if (requestCode == EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE) { if (ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) { Toast.makeText(this, R.string.external_storage_not_writable, Toast.LENGTH_LONG).show(); } else { - takePicture(); + startActivityForResult(IntentUtils.createTakePictureIntent(this, trackId), CAMERA_REQUEST_CODE); } return; } diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java index 142835a20..9c840cc20 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java @@ -18,7 +18,6 @@ package de.dennisguse.opentracks; import android.Manifest; import android.app.SearchManager; -import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; @@ -26,11 +25,9 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.content.pm.PackageManager; import android.database.Cursor; import android.location.LocationManager; -import android.net.Uri; import android.os.Bundle; import android.provider.Settings; import android.util.Log; -import android.util.Pair; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.Gravity; @@ -57,7 +54,6 @@ import androidx.loader.content.Loader; import java.util.Locale; import de.dennisguse.opentracks.content.ContentProviderUtils; -import de.dennisguse.opentracks.content.ShareContentProvider; import de.dennisguse.opentracks.content.TracksColumns; import de.dennisguse.opentracks.fragments.ConfirmDeleteDialogFragment; import de.dennisguse.opentracks.services.ITrackRecordingService; @@ -557,28 +553,6 @@ public class TrackListActivity extends AbstractTrackActivity implements ConfirmD bindChangedCallback.run(); } - /** - * Send intent to show tracks on a map (needs an another app). - * - * @param trackIds - */ - private void showOnExternalMap(long[] trackIds) { - if (trackIds.length == 0) { - return; - } - - Pair uriAndMime = ShareContentProvider.createURI(trackIds); - Intent intent = new Intent(); - intent.setAction(android.content.Intent.ACTION_VIEW); - intent.setDataAndType(uriAndMime.first, uriAndMime.second); - intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - try { - startActivity(intent); - } catch (ActivityNotFoundException e) { - Toast.makeText(this, "No app installed that can show the tracks on a map.", Toast.LENGTH_SHORT).show(); - } - } - /** * Handles a context item selection. * @@ -589,7 +563,7 @@ public class TrackListActivity extends AbstractTrackActivity implements ConfirmD private boolean handleContextItem(int itemId, long[] trackIds) { switch (itemId) { case R.id.list_context_menu_show_on_map: - showOnExternalMap(trackIds); + IntentUtils.showTrackOnMap(this, trackIds); return true; case R.id.list_context_menu_share: //TODO diff --git a/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java index 96bda12a2..7f1841e1d 100644 --- a/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/IntentUtils.java @@ -16,10 +16,20 @@ package de.dennisguse.opentracks.util; +import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.net.Uri; +import android.provider.MediaStore; +import android.util.Log; import android.util.Pair; +import android.widget.Toast; + +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.content.ContentProviderUtils; @@ -35,6 +45,8 @@ import de.dennisguse.opentracks.content.Waypoint; */ public class IntentUtils { + private final static String TAG = IntentUtils.class.getCanonicalName(); + private IntentUtils() { } @@ -49,11 +61,17 @@ public class IntentUtils { return new Intent(context, cls).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK); } + private static final String JPEG_EXTENSION = "jpeg"; + + public static Intent newShowCoordinateOnMapIntent(Waypoint waypoint) { + return newShowCoordinateOnMapIntent(waypoint.getLocation().getLatitude(), waypoint.getLocation().getLongitude(), waypoint.getName()); + } + /** * Creates an intent to share a track file with an app. * - * @param context the context - * @param trackId the track id + * @param context the context + * @param trackId the track id */ public static Intent newShareFileIntent(Context context, long trackId) { Track track = ContentProviderUtils.Factory.get(context).getTrack(trackId); @@ -69,18 +87,57 @@ public class IntentUtils { .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); } - public static Intent newShowCoordinateOnMapIntent(Waypoint waypoint) { - return newShowCoordinateOnMapIntent(waypoint.getLocation().getLatitude(), waypoint.getLocation().getLongitude(), waypoint.getName()); - } - public static Intent newShowCoordinateOnMapIntent(double latitude, double longitude, String label) { //SEE https://developer.android.com/guide/components/intents-common.html#Maps - Intent intent = new Intent(Intent.ACTION_VIEW); String uri = "geo:0,0?q=" + latitude + "," + longitude; if (label != null && label.length() > 0) { uri += "(" + label + ")"; } + Intent intent = new Intent(Intent.ACTION_VIEW); intent.setData(Uri.parse(uri)); return intent; } + + /** + * Send intent to show tracks on a map (needs an another app). + * + * @param context the context + * @param trackIds the track ids + */ + public static void showTrackOnMap(Context context, long[] trackIds) { + if (trackIds.length == 0) { + return; + } + + Pair uriAndMime = ShareContentProvider.createURI(trackIds); + Intent intent = new Intent(); + intent.setAction(android.content.Intent.ACTION_VIEW); + intent.setDataAndType(uriAndMime.first, uriAndMime.second); + intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); + try { + context.startActivity(intent); + } catch (ActivityNotFoundException e) { + Toast.makeText(context, "No app installed that can show the tracks on a map.", Toast.LENGTH_SHORT).show(); + } + } + + /** + * 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 + */ + public static Intent createTakePictureIntent(Context context, long trackId) { + File dir = FileUtils.getPhotoDir(trackId); + FileUtils.ensureDirectoryExists(dir); + + 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); + return new Intent(MediaStore.ACTION_IMAGE_CAPTURE) + .putExtra(MediaStore.EXTRA_OUTPUT, photoUri); + } }