Fix errors reported by lint
This commit is contained in:
parent
0034e1faff
commit
14996c1eca
@ -29,6 +29,7 @@ android {
|
|||||||
|
|
||||||
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
||||||
minSdkVersion 14
|
minSdkVersion 14
|
||||||
|
//noinspection ExpiredTargetSdkVersion
|
||||||
targetSdkVersion 25
|
targetSdkVersion 25
|
||||||
/*
|
/*
|
||||||
The Android Testing Support Library collects analytics to continuously improve the testing
|
The Android Testing Support Library collects analytics to continuously improve the testing
|
||||||
|
@ -692,6 +692,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onActivityResult(int requestCode, int resultCode, Intent intent) {
|
public void onActivityResult(int requestCode, int resultCode, Intent intent) {
|
||||||
|
super.onActivityResult(requestCode, resultCode, intent);
|
||||||
IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
|
IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
|
||||||
if (scanResult != null) {
|
if (scanResult != null) {
|
||||||
if (scanResult.getContents() != null) {
|
if (scanResult.getContents() != null) {
|
||||||
|
@ -5,13 +5,15 @@ import android.system.ErrnoException;
|
|||||||
import android.system.Os;
|
import android.system.Os;
|
||||||
import android.system.StructStat;
|
import android.system.StructStat;
|
||||||
|
|
||||||
|
import androidx.annotation.RequiresApi;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Helper class to prevent {@link VerifyError}s from occurring in {@link CleanCacheService#clearOldFiles(File, long)}
|
* Helper class to prevent {@link VerifyError}s from occurring in {@link CleanCacheService#clearOldFiles(File, long)}
|
||||||
* due to the fact that {@link Os} was only introduced in API 21.
|
* due to the fact that {@link Os} was only introduced in API 21.
|
||||||
*/
|
*/
|
||||||
@TargetApi(21)
|
@RequiresApi(21)
|
||||||
class CleanCacheService21 {
|
class CleanCacheService21 {
|
||||||
static void deleteIfOld(File file, long olderThan) {
|
static void deleteIfOld(File file, long olderThan) {
|
||||||
if (file == null || !file.exists()) {
|
if (file == null || !file.exists()) {
|
||||||
|
@ -5,6 +5,8 @@ import android.os.Build;
|
|||||||
import android.system.ErrnoException;
|
import android.system.ErrnoException;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
|
import androidx.annotation.RequiresApi;
|
||||||
|
|
||||||
import org.fdroid.fdroid.FDroidApp;
|
import org.fdroid.fdroid.FDroidApp;
|
||||||
import org.fdroid.fdroid.Utils;
|
import org.fdroid.fdroid.Utils;
|
||||||
import org.fdroid.fdroid.data.SanitizedFile;
|
import org.fdroid.fdroid.data.SanitizedFile;
|
||||||
@ -40,6 +42,7 @@ public class FileCompat {
|
|||||||
* not attempt to load this class at runtime. Otherwise, using the Os.symlink method will cause
|
* not attempt to load this class at runtime. Otherwise, using the Os.symlink method will cause
|
||||||
* a VerifyError to be thrown at runtime when the FileCompat class is first used.
|
* a VerifyError to be thrown at runtime when the FileCompat class is first used.
|
||||||
*/
|
*/
|
||||||
|
@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
|
||||||
private static class Symlink21 {
|
private static class Symlink21 {
|
||||||
|
|
||||||
@TargetApi(21)
|
@TargetApi(21)
|
||||||
|
@ -158,6 +158,7 @@ public class DefaultInstallerActivity extends FragmentActivity {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||||
|
super.onActivityResult(requestCode, resultCode, data);
|
||||||
switch (requestCode) {
|
switch (requestCode) {
|
||||||
case REQUEST_CODE_INSTALL:
|
case REQUEST_CODE_INSTALL:
|
||||||
switch (resultCode) {
|
switch (resultCode) {
|
||||||
|
@ -1,15 +1,16 @@
|
|||||||
package org.fdroid.fdroid.qr;
|
package org.fdroid.fdroid.qr;
|
||||||
|
|
||||||
import android.annotation.TargetApi;
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.hardware.camera2.CameraAccessException;
|
import android.hardware.camera2.CameraAccessException;
|
||||||
import android.hardware.camera2.CameraCharacteristics;
|
import android.hardware.camera2.CameraCharacteristics;
|
||||||
import android.hardware.camera2.CameraManager;
|
import android.hardware.camera2.CameraManager;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
|
import androidx.annotation.NonNull;
|
||||||
|
import androidx.annotation.RequiresApi;
|
||||||
|
|
||||||
|
@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
|
||||||
public class CameraCharacteristicsMinApiLevel21 extends CameraCharacteristicsChecker {
|
public class CameraCharacteristicsMinApiLevel21 extends CameraCharacteristicsChecker {
|
||||||
|
|
||||||
private static final String TAG = "CameraCharMinApiLevel21";
|
private static final String TAG = "CameraCharMinApiLevel21";
|
||||||
|
@ -306,6 +306,7 @@ public class AppDetailsActivity extends AppCompatActivity
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||||
|
super.onActivityResult(requestCode, resultCode, data);
|
||||||
switch (requestCode) {
|
switch (requestCode) {
|
||||||
case REQUEST_ENABLE_BLUETOOTH:
|
case REQUEST_ENABLE_BLUETOOTH:
|
||||||
fdroidApp.sendViaBluetooth(this, resultCode, app.packageName);
|
fdroidApp.sendViaBluetooth(this, resultCode, app.packageName);
|
||||||
|
@ -140,6 +140,7 @@ public class ManageReposActivity extends AppCompatActivity
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onNewIntent(Intent intent) {
|
protected void onNewIntent(Intent intent) {
|
||||||
|
super.onNewIntent(intent);
|
||||||
setIntent(intent);
|
setIntent(intent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -173,6 +173,7 @@ public class RepoDetailsActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onNewIntent(Intent i) {
|
public void onNewIntent(Intent i) {
|
||||||
|
super.onNewIntent(i);
|
||||||
// onResume gets called after this to handle the intent
|
// onResume gets called after this to handle the intent
|
||||||
setIntent(i);
|
setIntent(i);
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
|
<!-- Taken from here: https://stackoverflow.com/a/53969021 -->
|
||||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||||
<bool name="config_materialPreferenceIconSpaceReserved" tools:ignore="MissingDefaultResource,PrivateResource">false</bool>
|
<bool name="config_materialPreferenceIconSpaceReserved" tools:ignore="MissingDefaultResource,PrivateResource,UnusedResources">false</bool>
|
||||||
<dimen name="preference_category_padding_start" tools:ignore="MissingDefaultResource,PrivateResource">0dp</dimen>
|
<dimen name="preference_category_padding_start" tools:ignore="MissingDefaultResource,PrivateResource,UnusedResources">0dp</dimen>
|
||||||
</resources>
|
</resources>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user