karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Bugfix: handle missing permissions properly.

Browse Source 
Affected only SDK >= 33.

Fixes #1781.
This commit is contained in:
Dennis Guse
2024-04-01 17:40:32 +02:00
parent 48baece0e5
commit 4bfd65bb6d
6 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/TrackListActivity.java
+13 -3
View File
@@ -40,6 +40,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import com.google.android.material.button.MaterialButton;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Objects;
@@ -47,6 +48,7 @@ import java.util.Objects;
import de.dennisguse.opentracks.data.ContentProviderUtils;
import de.dennisguse.opentracks.data.models.Track;
import de.dennisguse.opentracks.databinding.TrackListBinding;
import de.dennisguse.opentracks.services.MissingPermissionException;
import de.dennisguse.opentracks.services.RecordingStatus;
import de.dennisguse.opentracks.services.TrackRecordingService;
import de.dennisguse.opentracks.services.TrackRecordingServiceConnection;
@@ -159,7 +161,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
if (gpsStatusValue.isGpsStarted()) {
recordingStatusConnection.stopService(this);
} else {
TrackRecordingServiceConnection.executeForeground(this, (service, connection) -> service.tryStartSensors());
startSensorsOrRecording((service, connection) -> service.tryStartSensors());
}
}
});
@@ -178,7 +180,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
// Not Recording -> Recording
Log.i(TAG, "Starting recording");
updateGpsMenuItem(false, true);
TrackRecordingServiceConnection.executeForeground(this, (service, connection) -> {
startSensorsOrRecording((service, connection) -> {
Track.Id trackId = service.startNewTrack();
Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordingActivity.class);
@@ -192,7 +194,7 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
}
// Recording -> Stop
ActivityUtils.vibrate(this, 1000);
ActivityUtils.vibrate(this, Duration.ofSeconds(1));
updateGpsMenuItem(false, false);
recordingStatusConnection.stopRecording(TrackListActivity.this);
viewBinding.trackListFabAction.setImageResource(R.drawable.ic_baseline_record_24);
@@ -445,4 +447,12 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
setFloatButton();
adapter.updateRecordingStatus(recordingStatus);
}
private void startSensorsOrRecording(TrackRecordingServiceConnection.Callback callback) {
try {
TrackRecordingServiceConnection.executeForeground(this, callback);
} catch (MissingPermissionException e) {
Toast.makeText(this, R.string.permission_recording_failed, Toast.LENGTH_LONG).show();
}
}
}
src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
+2 -1
View File
@@ -24,6 +24,7 @@ import androidx.viewpager2.adapter.FragmentStateAdapter;
import com.google.android.material.snackbar.Snackbar;
import com.google.android.material.tabs.TabLayoutMediator;
import java.time.Duration;
import java.util.List;
import de.dennisguse.opentracks.chart.ChartFragment;
@@ -136,7 +137,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
viewBinding.trackRecordingFabAction.setBackgroundTintList(ContextCompat.getColorStateList(this, R.color.opentracks));
viewBinding.trackRecordingFabAction.setBackgroundColor(ContextCompat.getColor(this, R.color.opentracks));
viewBinding.trackRecordingFabAction.setOnLongClickListener((view) -> {
ActivityUtils.vibrate(this, 1000);
ActivityUtils.vibrate(this, Duration.ofSeconds(1));
trackRecordingServiceConnection.stopRecording(TrackRecordingActivity.this);
Intent newIntent = IntentUtils.newIntent(TrackRecordingActivity.this, TrackStoppedActivity.class)
.putExtra(TrackStoppedActivity.EXTRA_TRACK_ID, trackId);
src/main/java/de/dennisguse/opentracks/services/MissingPermissionException.java
+12
View File
@@ -0,0 +1,12 @@
package de.dennisguse.opentracks.services;
import de.dennisguse.opentracks.util.PermissionRequester;
public class MissingPermissionException extends RuntimeException {
private final PermissionRequester permissionRequester;
public MissingPermissionException(PermissionRequester permissionRequester) {
this.permissionRequester = permissionRequester;
}
}
src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
-9
View File
@@ -20,7 +20,6 @@ import android.app.Service;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ServiceInfo;
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.os.PowerManager.WakeLock;
@@ -46,7 +45,6 @@ import de.dennisguse.opentracks.services.announcement.VoiceAnnouncementManager;
import de.dennisguse.opentracks.services.handlers.GpsStatusValue;
import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
import de.dennisguse.opentracks.settings.PreferencesUtils;
import de.dennisguse.opentracks.util.PermissionRequester;
import de.dennisguse.opentracks.util.SystemUtils;
public class TrackRecordingService extends Service implements TrackPointCreator.Callback, SharedPreferences.OnSharedPreferenceChangeListener, TrackRecordingManager.IdleObserver {
@@ -207,18 +205,11 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
private synchronized void startSensors() {
if (isSensorStarted()) {
Log.i(TAG, "sensors already started; skipping");
return;
}
Log.i(TAG, "startSensors");
wakeLock = SystemUtils.acquireWakeLock(this, wakeLock);
trackPointCreator.start(this, handler);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
if (!PermissionRequester.RECORDING.hasPermission(this)) {
throw new RuntimeException("Android14: Please grant permissions LOCATION and NEARBY DEVICES (manually)");
}
}
ServiceCompat.startForeground(this, TrackRecordingServiceNotificationManager.NOTIFICATION_ID, notificationManager.setGPSonlyStarted(this), ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION + ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE);
}
src/main/java/de/dennisguse/opentracks/services/TrackRecordingServiceConnection.java
+8
View File
@@ -20,6 +20,7 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.Build;
import android.os.IBinder;
import android.os.IBinder.DeathRecipient;
import android.os.RemoteException;
@@ -29,6 +30,7 @@ import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import de.dennisguse.opentracks.BuildConfig;
import de.dennisguse.opentracks.util.PermissionRequester;
/**
* Wrapper for the track recording service.
@@ -157,6 +159,12 @@ public class TrackRecordingServiceConnection {
}
public static void executeForeground(Context context, Callback callback) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
if (!PermissionRequester.RECORDING.hasPermission(context)) {
throw new MissingPermissionException(PermissionRequester.RECORDING);
}
}
Callback withUnbind = (service, connection) -> {
callback.onConnected(service, connection);
connection.unbind(context);
src/main/java/de/dennisguse/opentracks/ui/util/ActivityUtils.java
+5 -3
View File
@@ -15,6 +15,8 @@ import android.view.MenuItem;
import androidx.annotation.NonNull;
import androidx.appcompat.widget.SearchView;
import java.time.Duration;
public class ActivityUtils {
private static final String TAG = ActivityUtils.class.getSimpleName();
@@ -32,12 +34,12 @@ public class ActivityUtils {
return searchView;
}
public static void vibrate(@NonNull Context context, int milliseconds) {
public static void vibrate(@NonNull Context context, Duration duration) {
final Vibrator vibrator = (Vibrator) context.getSystemService(VIBRATOR_SERVICE);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
vibrator.vibrate(VibrationEffect.createOneShot(milliseconds, VibrationEffect.DEFAULT_AMPLITUDE));
vibrator.vibrate(VibrationEffect.createOneShot(duration.toMillis(), VibrationEffect.DEFAULT_AMPLITUDE));
} else {
vibrator.vibrate(milliseconds);
vibrator.vibrate(duration.toMillis());
}
}