From ecb6db84f533f633b06429899d043e8d7e3886b8 Mon Sep 17 00:00:00 2001
From: "Chris J. Karr" <chris@audacious-software.com>
Date: Sun, 28 May 2017 15:51:03 -0500
Subject: [PATCH 1/2] Relaxing variables' visibility for Location and
 ScreenState generators.

* Linting excemptions for generators unused in other apps.
---
 .../passive_data_kit/generators/device/Location.java       | 6 +++---
 .../passive_data_kit/generators/device/ScreenState.java    | 4 ++--
 .../generators/wearables/WithingsDevice.java               | 7 +++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/com/audacious_software/passive_data_kit/generators/device/Location.java b/src/com/audacious_software/passive_data_kit/generators/device/Location.java
index 58b655a..ed4bb20 100755
--- a/src/com/audacious_software/passive_data_kit/generators/device/Location.java
+++ b/src/com/audacious_software/passive_data_kit/generators/device/Location.java
@@ -120,9 +120,9 @@ public class Location extends Generator implements GoogleApiClient.ConnectionCal
     private static final int DATABASE_VERSION = 1;
 
     private static final String TABLE_HISTORY = "history";
-    private static final String HISTORY_OBSERVED = "observed";
-    private static final String HISTORY_LATITUDE = "latitude";
-    private static final String HISTORY_LONGITUDE = "longitude";
+    public static final String HISTORY_OBSERVED = "observed";
+    public static final String HISTORY_LATITUDE = "latitude";
+    public static final String HISTORY_LONGITUDE = "longitude";
     private static final String HISTORY_ALTITUDE = "altitude";
     private static final String HISTORY_BEARING = "bearing";
     private static final String HISTORY_SPEED = "speed";
diff --git a/src/com/audacious_software/passive_data_kit/generators/device/ScreenState.java b/src/com/audacious_software/passive_data_kit/generators/device/ScreenState.java
index 563b519..d7ed837 100755
--- a/src/com/audacious_software/passive_data_kit/generators/device/ScreenState.java
+++ b/src/com/audacious_software/passive_data_kit/generators/device/ScreenState.java
@@ -57,8 +57,8 @@ public class ScreenState extends Generator{
     private static final String DATABASE_PATH = "pdk-screen-state.sqlite";
     private static final int DATABASE_VERSION = 2;
 
-    private static final String HISTORY_OBSERVED = "observed";
-    private static final String HISTORY_STATE = "state";
+    public static final String HISTORY_OBSERVED = "observed";
+    public static final String HISTORY_STATE = "state";
     private static final String TABLE_HISTORY = "history";
 
     private static ScreenState sInstance = null;
diff --git a/src/com/audacious_software/passive_data_kit/generators/wearables/WithingsDevice.java b/src/com/audacious_software/passive_data_kit/generators/wearables/WithingsDevice.java
index c63a05c..56e00b8 100755
--- a/src/com/audacious_software/passive_data_kit/generators/wearables/WithingsDevice.java
+++ b/src/com/audacious_software/passive_data_kit/generators/wearables/WithingsDevice.java
@@ -1793,6 +1793,7 @@ private static String bindWorkoutsPage(ViewGroup container, DataPointViewHolder
         return "" + card.getTag();
     }
 
+    @SuppressWarnings("unused")
     public void enableActivityMeasures(boolean enable) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.mContext);
         SharedPreferences.Editor e = prefs.edit();
@@ -1802,6 +1803,7 @@ public void enableActivityMeasures(boolean enable) {
         e.apply();
     }
 
+    @SuppressWarnings("unused")
     public void enableBodyMeasures(boolean enable) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.mContext);
         SharedPreferences.Editor e = prefs.edit();
@@ -1811,6 +1813,7 @@ public void enableBodyMeasures(boolean enable) {
         e.apply();
     }
 
+    @SuppressWarnings("unused")
     public void enableIntradayActivity(boolean enable) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.mContext);
         SharedPreferences.Editor e = prefs.edit();
@@ -1820,6 +1823,7 @@ public void enableIntradayActivity(boolean enable) {
         e.apply();
     }
 
+    @SuppressWarnings("unused")
     public void enableSleepMeasures(boolean enable) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.mContext);
         SharedPreferences.Editor e = prefs.edit();
@@ -1829,6 +1833,7 @@ public void enableSleepMeasures(boolean enable) {
         e.apply();
     }
 
+    @SuppressWarnings("unused")
     public void enableSleepSummary(boolean enable) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.mContext);
         SharedPreferences.Editor e = prefs.edit();
@@ -1838,6 +1843,7 @@ public void enableSleepSummary(boolean enable) {
         e.apply();
     }
 
+    @SuppressWarnings("unused")
     public void enableWorkouts(boolean enable) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.mContext);
         SharedPreferences.Editor e = prefs.edit();
@@ -1847,6 +1853,7 @@ public void enableWorkouts(boolean enable) {
         e.apply();
     }
 
+    @SuppressWarnings("unused")
     public void enableServerFetch(boolean enable) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.mContext);
         SharedPreferences.Editor e = prefs.edit();

From 25433c2f8faefbd3e8bdc54cdcef8571d6cc4b49 Mon Sep 17 00:00:00 2001
From: "Chris J. Karr" <chris@audacious-software.com>
Date: Sun, 28 May 2017 17:51:13 -0500
Subject: [PATCH 2/2] Fine-tuning linting parameters.

---
 .../passive_data_kit/DeviceInformation.java                  | 2 ++
 src/com/audacious_software/passive_data_kit/Logger.java      | 1 +
 .../passive_data_kit/activities/DiagnosticsActivity.java     | 1 +
 .../passive_data_kit/generators/Generators.java              | 1 +
 .../passive_data_kit/generators/device/Location.java         | 5 ++++-
 .../passive_data_kit/generators/device/ScreenState.java      | 2 ++
 .../generators/diagnostics/SystemStatus.java                 | 2 ++
 .../passive_data_kit/generators/sensors/Accelerometer.java   | 3 +++
 .../generators/wearables/WithingsDevice.java                 | 4 ++++
 .../passive_data_kit/transmitters/HttpTransmitter.java       | 3 ++-
 .../passive_data_kit/transmitters/Transmitter.java           | 2 +-
 .../transmitters/util/LiberalSSLSocketFactory.java           | 1 +
 12 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/com/audacious_software/passive_data_kit/DeviceInformation.java b/src/com/audacious_software/passive_data_kit/DeviceInformation.java
index 2e35677..634ea9f 100755
--- a/src/com/audacious_software/passive_data_kit/DeviceInformation.java
+++ b/src/com/audacious_software/passive_data_kit/DeviceInformation.java
@@ -1,5 +1,6 @@
 package com.audacious_software.passive_data_kit;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -59,6 +60,7 @@ else if (netInfo.getState() != NetworkInfo.State.CONNECTED
         return DeviceInformation.sWifiAvailable;
     }
 
+    @SuppressLint("InlinedApi")
     @SuppressWarnings("ConstantConditions")
     public static boolean isPluggedIn(Context context) {
         Intent intent = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
diff --git a/src/com/audacious_software/passive_data_kit/Logger.java b/src/com/audacious_software/passive_data_kit/Logger.java
index 2b59c1a..73b37d6 100755
--- a/src/com/audacious_software/passive_data_kit/Logger.java
+++ b/src/com/audacious_software/passive_data_kit/Logger.java
@@ -11,6 +11,7 @@
 public class Logger {
     private Context mContext = null;
 
+    @SuppressWarnings("SameParameterValue")
     public void log(String event, Map<String, ?> details) {
         if (details == null) {
             details = new HashMap<>();
diff --git a/src/com/audacious_software/passive_data_kit/activities/DiagnosticsActivity.java b/src/com/audacious_software/passive_data_kit/activities/DiagnosticsActivity.java
index 2f71bbd..e11122b 100755
--- a/src/com/audacious_software/passive_data_kit/activities/DiagnosticsActivity.java
+++ b/src/com/audacious_software/passive_data_kit/activities/DiagnosticsActivity.java
@@ -20,6 +20,7 @@
 
 import java.util.ArrayList;
 
+@SuppressWarnings("unused")
 public class DiagnosticsActivity extends AppCompatActivity {
     @SuppressWarnings("SameParameterValue")
     @SuppressLint("AlwaysShowAction")
diff --git a/src/com/audacious_software/passive_data_kit/generators/Generators.java b/src/com/audacious_software/passive_data_kit/generators/Generators.java
index b2a31b1..204c7c8 100755
--- a/src/com/audacious_software/passive_data_kit/generators/Generators.java
+++ b/src/com/audacious_software/passive_data_kit/generators/Generators.java
@@ -24,6 +24,7 @@
 import java.util.HashSet;
 import java.util.List;
 
+@SuppressWarnings("unused")
 public class Generators {
     private Context mContext = null;
     private boolean mStarted = false;
diff --git a/src/com/audacious_software/passive_data_kit/generators/device/Location.java b/src/com/audacious_software/passive_data_kit/generators/device/Location.java
index ed4bb20..8cff135 100755
--- a/src/com/audacious_software/passive_data_kit/generators/device/Location.java
+++ b/src/com/audacious_software/passive_data_kit/generators/device/Location.java
@@ -120,8 +120,11 @@ public class Location extends Generator implements GoogleApiClient.ConnectionCal
     private static final int DATABASE_VERSION = 1;
 
     private static final String TABLE_HISTORY = "history";
+    @SuppressWarnings("WeakerAccess")
     public static final String HISTORY_OBSERVED = "observed";
+    @SuppressWarnings("WeakerAccess")
     public static final String HISTORY_LATITUDE = "latitude";
+    @SuppressWarnings("WeakerAccess")
     public static final String HISTORY_LONGITUDE = "longitude";
     private static final String HISTORY_ALTITUDE = "altitude";
     private static final String HISTORY_BEARING = "bearing";
@@ -1005,7 +1008,7 @@ public android.location.Location getLastKnownLocation() {
         return last;
     }
 
-    @SuppressWarnings("SameParameterValue")
+    @SuppressWarnings({"SameParameterValue", "unused"})
     public void setUpdateInterval(long interval) {
         this.mUpdateInterval = interval;
 
diff --git a/src/com/audacious_software/passive_data_kit/generators/device/ScreenState.java b/src/com/audacious_software/passive_data_kit/generators/device/ScreenState.java
index d7ed837..6935449 100755
--- a/src/com/audacious_software/passive_data_kit/generators/device/ScreenState.java
+++ b/src/com/audacious_software/passive_data_kit/generators/device/ScreenState.java
@@ -57,7 +57,9 @@ public class ScreenState extends Generator{
     private static final String DATABASE_PATH = "pdk-screen-state.sqlite";
     private static final int DATABASE_VERSION = 2;
 
+    @SuppressWarnings("WeakerAccess")
     public static final String HISTORY_OBSERVED = "observed";
+    @SuppressWarnings("WeakerAccess")
     public static final String HISTORY_STATE = "state";
     private static final String TABLE_HISTORY = "history";
 
diff --git a/src/com/audacious_software/passive_data_kit/generators/diagnostics/SystemStatus.java b/src/com/audacious_software/passive_data_kit/generators/diagnostics/SystemStatus.java
index a1a2397..32d9750 100755
--- a/src/com/audacious_software/passive_data_kit/generators/diagnostics/SystemStatus.java
+++ b/src/com/audacious_software/passive_data_kit/generators/diagnostics/SystemStatus.java
@@ -1,5 +1,6 @@
 package com.audacious_software.passive_data_kit.generators.diagnostics;
 
+import android.annotation.SuppressLint;
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
@@ -43,6 +44,7 @@
 import java.util.List;
 
 @SuppressWarnings("SimplifiableIfStatement")
+@SuppressLint("NewApi")
 public class SystemStatus extends Generator {
     private static final String GENERATOR_IDENTIFIER = "pdk-system-status";
 
diff --git a/src/com/audacious_software/passive_data_kit/generators/sensors/Accelerometer.java b/src/com/audacious_software/passive_data_kit/generators/sensors/Accelerometer.java
index ffc851a..6d97746 100755
--- a/src/com/audacious_software/passive_data_kit/generators/sensors/Accelerometer.java
+++ b/src/com/audacious_software/passive_data_kit/generators/sensors/Accelerometer.java
@@ -111,6 +111,7 @@ public static String generatorIdentifier() {
         return Accelerometer.GENERATOR_IDENTIFIER;
     }
 
+    @SuppressWarnings("WeakerAccess")
     public static Accelerometer getInstance(Context context) {
         if (Accelerometer.sInstance == null) {
             Accelerometer.sInstance = new Accelerometer(context.getApplicationContext());
@@ -140,6 +141,7 @@ public void setIgnorePowerManagement(boolean ignore) {
         this.startGenerator();
     }
 
+    @SuppressWarnings("unused")
     public void setRefreshInterval(long interval) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.mContext);
         SharedPreferences.Editor e = prefs.edit();
@@ -151,6 +153,7 @@ public void setRefreshInterval(long interval) {
         this.startGenerator();
     }
 
+    @SuppressWarnings("unused")
     public void setRefreshDuration(long duration) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.mContext);
         SharedPreferences.Editor e = prefs.edit();
diff --git a/src/com/audacious_software/passive_data_kit/generators/wearables/WithingsDevice.java b/src/com/audacious_software/passive_data_kit/generators/wearables/WithingsDevice.java
index 56e00b8..cb9e9b3 100755
--- a/src/com/audacious_software/passive_data_kit/generators/wearables/WithingsDevice.java
+++ b/src/com/audacious_software/passive_data_kit/generators/wearables/WithingsDevice.java
@@ -211,8 +211,11 @@ public class WithingsDevice extends Generator {
     private static final String SERVER_FETCH_ENABLED = "com.audacious_software.passive_data_kit.generators.wearables.WithingsDevice.SERVER_FETCH_ENABLED";
     private static final boolean SERVER_FETCH_ENABLED_DEFAULT = false;
 
+    @SuppressWarnings("WeakerAccess")
     public static final String OPTION_OAUTH_CALLBACK_URL = "com.audacious_software.passive_data_kit.generators.wearables.WithingsDevice.OPTION_CALLBACK_URL";
+    @SuppressWarnings("WeakerAccess")
     public static final String OPTION_OAUTH_CONSUMER_KEY = "com.audacious_software.passive_data_kit.generators.wearables.WithingsDevice.OPTION_OAUTH_CONSUMER_KEY";
+    @SuppressWarnings("WeakerAccess")
     public static final String OPTION_OAUTH_CONSUMER_SECRET = "com.audacious_software.passive_data_kit.generators.wearables.WithingsDevice.OPTION_OAUTH_CONSUMER_SECRET";
     private static final String OPTION_OAUTH_ACCESS_TOKEN = "com.audacious_software.passive_data_kit.generators.wearables.WithingsDevice.OPTION_OAUTH_ACCESS_TOKEN";
     private static final String OPTION_OAUTH_ACCESS_TOKEN_SECRET = "com.audacious_software.passive_data_kit.generators.wearables.WithingsDevice.OPTION_OAUTH_ACCESS_TOKEN_SECRET";
@@ -1501,6 +1504,7 @@ public static long latestPointGenerated(Context context) {
         return timestamp;
     }
 
+    @SuppressWarnings("WeakerAccess")
     public void setProperty(String key, String value) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.mContext);
 
diff --git a/src/com/audacious_software/passive_data_kit/transmitters/HttpTransmitter.java b/src/com/audacious_software/passive_data_kit/transmitters/HttpTransmitter.java
index d2ed9ab..308d526 100755
--- a/src/com/audacious_software/passive_data_kit/transmitters/HttpTransmitter.java
+++ b/src/com/audacious_software/passive_data_kit/transmitters/HttpTransmitter.java
@@ -51,7 +51,7 @@
 import okhttp3.RequestBody;
 import okhttp3.Response;
 
-@SuppressWarnings("PointlessBooleanExpression")
+@SuppressWarnings({"PointlessBooleanExpression", "unused"})
 public class HttpTransmitter extends Transmitter implements Generators.GeneratorUpdatedListener {
     public static final String UPLOAD_URI = "com.audacious_software.passive_data_kit.transmitters.HttpTransmitter.UPLOAD_URI";
     public static final String USER_ID = "com.audacious_software.passive_data_kit.transmitters.HttpTransmitter.USER_ID";
@@ -686,6 +686,7 @@ public void setUserId(String userId) {
         this.mUserId = userId;
     }
 
+    @SuppressWarnings("unused")
     public static class IncompleteConfigurationException extends RuntimeException {
         public IncompleteConfigurationException(String message) {
             super(message);
diff --git a/src/com/audacious_software/passive_data_kit/transmitters/Transmitter.java b/src/com/audacious_software/passive_data_kit/transmitters/Transmitter.java
index ecbb2e3..0d5a269 100755
--- a/src/com/audacious_software/passive_data_kit/transmitters/Transmitter.java
+++ b/src/com/audacious_software/passive_data_kit/transmitters/Transmitter.java
@@ -4,7 +4,7 @@
 
 import java.util.HashMap;
 
-@SuppressWarnings("WeakerAccess")
+@SuppressWarnings({"WeakerAccess", "unused"})
 public abstract class Transmitter {
     @SuppressWarnings("unused")
     public abstract void initialize(Context context, HashMap<String, String> options);
diff --git a/src/com/audacious_software/passive_data_kit/transmitters/util/LiberalSSLSocketFactory.java b/src/com/audacious_software/passive_data_kit/transmitters/util/LiberalSSLSocketFactory.java
index 51a1c3c..a9d35ba 100755
--- a/src/com/audacious_software/passive_data_kit/transmitters/util/LiberalSSLSocketFactory.java
+++ b/src/com/audacious_software/passive_data_kit/transmitters/util/LiberalSSLSocketFactory.java
@@ -17,6 +17,7 @@
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
+@SuppressWarnings("unused")
 public class LiberalSSLSocketFactory extends SSLSocketFactory
 {
     private final SSLContext sslContext = SSLContext.getInstance("TLS");