De-Lint

diff --git a/mobile/build.gradle b/mobile/build.gradle
index fa3f8a61c3f50c079447d80cc75863673778f5c5..e12fcb8788c383d105e3267bad529bec65f6ad9e 100644 (file)
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -67,6 +67,7 @@ dependencies {
 
     api 'androidx.appcompat:appcompat:1.1.0'
     api 'androidx.legacy:legacy-support-v4:1.0.0'
+    api 'androidx.preference:preference:1.1.0'
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/main/Activity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/main/Activity.java
index 63b0021ce99db35d5737dbf16530f3e8d41ba2a4..40be764ea67c4b92ae099dda3d4d7cbba5efe9ca 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/main/Activity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/main/Activity.java
@@ -3,7 +3,7 @@ package com.acmetensortoys.ctfwstimer.activity.main;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 import androidx.annotation.StringRes;
 import android.os.Bundle;
 import androidx.appcompat.view.menu.MenuBuilder;
@@ -21,7 +21,6 @@ import com.acmetensortoys.ctfwstimer.R;
 import com.acmetensortoys.ctfwstimer.activity.AboutActivity;
 import com.acmetensortoys.ctfwstimer.activity.CtFwSActivityBase;
 import com.acmetensortoys.ctfwstimer.activity.HandbookActivity;
-import com.acmetensortoys.ctfwstimer.activity.main.BuildHooksImpl;
 import com.acmetensortoys.ctfwstimer.activity.SettingsActivity;
 import com.acmetensortoys.ctfwstimer.service.MainService;
 import com.acmetensortoys.ctfwstimer.utils.AndroidResourceUtils;

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainService.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainService.java
index 0c97e3117a431600dcaae18a5d6cca2c09a33474..c3d0e43176b035609b73e48b7235623baad2d971 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainService.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainService.java
@@ -7,7 +7,7 @@ import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 import androidx.annotation.Nullable;
 import androidx.core.util.Consumer;
 import android.util.Log;
@@ -57,7 +57,6 @@ public class MainService extends Service {
         }
     });
 
-    @SuppressWarnings({"FieldCanBeLocal"})
     private MainServiceNotification mMsn; // set in onCreate
 
     public MainService() { }

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java
index 6bf2e18d29b66eeefc791e921aff565e6dd48b48..169c0b36084c2235b2350c9bdd2356b6d1cc1b43 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java
@@ -63,7 +63,7 @@ class MainServiceNotification {
                 .setContentIntent(PendingIntent.getActivity(ms, 0, ni, 0));
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            userNoteBuilder.setVisibility(Notification.VISIBILITY_PUBLIC);
+            userNoteBuilder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
         }
 
         game.registerObserver(new CtFwSGameStateManager.Observer() {

diff --git a/mobile/src/main/res/xml/preferences.xml b/mobile/src/main/res/xml/preferences.xml
index 25220f603b9254b2b5d145c8d482ed158aba2cfe..fae6c1e576c88eecc56d0cbd8ab327422acab107 100644 (file)
--- a/mobile/src/main/res/xml/preferences.xml
+++ b/mobile/src/main/res/xml/preferences.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">\r
+<android.support.v7.preference.PreferenceScreen\r
+    xmlns:android="http://schemas.android.com/apk/res/android">\r
 \r
     <com.acmetensortoys.ctfwstimer.utils.DefaultableEditTextPreference\r
         android:selectAllOnFocus="true"\r
@@ -43,4 +44,4 @@
         android:key="prf_vibr_mesg"\r
         android:title="@string/preftext_sound_mesg" />\r
 \r
-</PreferenceScreen>\r
+</android.support.v7.preference.PreferenceScreen>\r