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

Lint: fix AGP7.0.0 found linting errors.

Browse Source
This commit is contained in:
Dennis Guse
2021-07-29 21:41:01 +02:00
parent fd1a53d1a6
commit 54be1b74fb
4 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/TrackListActivity.java
+6 -9
View File
@@ -27,7 +27,6 @@ import android.content.pm.PackageManager;
import android.database.Cursor; import android.database.Cursor;
import android.graphics.drawable.AnimatedVectorDrawable; import android.graphics.drawable.AnimatedVectorDrawable;
import android.location.LocationManager; import android.location.LocationManager;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import android.util.Log; import android.util.Log;
@@ -393,24 +392,22 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
} }
private void requestGPSPermissions() { private void requestGPSPermissions() {
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) { if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
&& ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
return; return;
} }
ActivityResultLauncher<String[]> locationPermissionRequest = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), result -> { ActivityResultLauncher<String[]> locationPermissionRequest = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), result -> {
Boolean fineLocationGranted = result.getOrDefault(Manifest.permission.ACCESS_FINE_LOCATION, false); Boolean fineLocationGranted = result.getOrDefault(Manifest.permission.ACCESS_FINE_LOCATION, false);
if (fineLocationGranted == null || !fineLocationGranted) { Boolean coarseLocationGranted = result.getOrDefault(Manifest.permission.ACCESS_COARSE_LOCATION, false);
if (fineLocationGranted == null || !fineLocationGranted
|| coarseLocationGranted == null || !coarseLocationGranted) {
Toast.makeText(this, R.string.permission_gps_failed, Toast.LENGTH_SHORT).show(); Toast.makeText(this, R.string.permission_gps_failed, Toast.LENGTH_SHORT).show();
finish(); finish();
} }
} }
); );
String[] permissions; String[] permissions = new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION};
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.R) {
permissions = new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION};
} else {
permissions = new String[]{Manifest.permission.ACCESS_FINE_LOCATION};
}
locationPermissionRequest.launch(permissions); locationPermissionRequest.launch(permissions);
} }
src/main/java/de/dennisguse/opentracks/io/file/importer/DirectoryChooserActivity.java
+1 -1
View File
@@ -113,7 +113,7 @@ public abstract class DirectoryChooserActivity extends AppCompatActivity {
Uri directoryUri = resultData.getData(); Uri directoryUri = resultData.getData();
PreferencesUtils.setDefaultExportDirectoryUri(sharedPreferences, this, directoryUri); PreferencesUtils.setDefaultExportDirectoryUri(sharedPreferences, this, directoryUri);
IntentUtils.persistDirectoryAccessPermission(getApplicationContext(), resultData, directoryUri); IntentUtils.persistDirectoryAccessPermission(getApplicationContext(), directoryUri);
break; break;
case RESULT_CANCELED: case RESULT_CANCELED:
PreferencesUtils.setDefaultExportDirectoryUri(sharedPreferences, this, null); PreferencesUtils.setDefaultExportDirectoryUri(sharedPreferences, this, null);
src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java
+2
View File
@@ -44,6 +44,8 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis
gpsStatus.start(); gpsStatus.start();
} }
@SuppressWarnings({"MissingPermission"})
//TODO upgrade to AGP7.0.0/API31 started complaining about removeUpdates.
public void onStop() { public void onStop() {
lastTrackPoint = null; lastTrackPoint = null;
if (locationManager != null) { if (locationManager != null) {
src/main/java/de/dennisguse/opentracks/util/IntentUtils.java
+3 -5
View File
@@ -200,10 +200,8 @@ public class IntentUtils {
return new Pair<>(intent, photoUri); return new Pair<>(intent, photoUri);
} }
public static void persistDirectoryAccessPermission(Context context, Intent resultData, Uri directoryUri) { public static void persistDirectoryAccessPermission(Context context, Uri directoryUri) {
final int takeFlags = resultData.getFlags() int flags = Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
& (Intent.FLAG_GRANT_READ_URI_PERMISSION context.getContentResolver().takePersistableUriPermission(directoryUri, flags);
| Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
context.getContentResolver().takePersistableUriPermission(directoryUri, takeFlags);
} }
} }