Various cleanup

Author: vbabenkoru

iterableapi/src/main/java/com/iterable/iterableapi/IterableActionRunner.java

@@ -11,15 +11,15 @@
 import java.util.List;
 
 class IterableActionRunner {
-    static final String TAG = "IterableActionRunner";
+    private static final String TAG = "IterableActionRunner";
 
     /**
      * Execute an {@link IterableAction} as a response to push action
      * @param context Context
      * @param action The original action object
      * @return `true` if the action was handled, `false` if it was not
      */
-    public static boolean executeAction(@NonNull Context context, @Nullable IterableAction action, @NonNull IterableActionSource source) {
+    static boolean executeAction(@NonNull Context context, @Nullable IterableAction action, @NonNull IterableActionSource source) {
         if (action == null) {
             return false;
         }

iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java

@@ -32,7 +32,7 @@ public class IterableApi {
 
 //region Variables
 //---------------------------------------------------------------------------------------
-    static final String TAG = "IterableApi";
+private static final String TAG = "IterableApi";
 
     /**
      * {@link IterableApi} singleton instance

iterableapi/src/main/java/com/iterable/iterableapi/IterableNotificationData.java

@@ -42,7 +42,7 @@ class IterableNotificationData {
             // Action buttons
             JSONArray actionButtonsJson = iterableJson.optJSONArray(IterableConstants.ITERABLE_DATA_ACTION_BUTTONS);
             if (actionButtonsJson != null) {
-                actionButtons = new ArrayList<Button>();
+                actionButtons = new ArrayList<>();
                 for (int i = 0; i < actionButtonsJson.length(); i++) {
                     JSONObject button = actionButtonsJson.getJSONObject(i);
                     actionButtons.add(new Button(button));

iterableapi/src/main/java/com/iterable/iterableapi/IterableRequest.java

@@ -276,11 +276,11 @@ class IterableApiRequest {
     static String GET = "GET";
     static String POST = "POST";
 
-    String apiKey = "";
-    String baseUrl = null;
-    String resourcePath = "";
-    JSONObject json;
-    String requestType = "";
+    final String apiKey;
+    final String baseUrl;
+    final String resourcePath;
+    final JSONObject json;
+    final String requestType;
 
     IterableHelper.IterableActionHandler legacyCallback;
     IterableHelper.SuccessHandler successCallback;
@@ -298,6 +298,7 @@ public IterableApiRequest(String apiKey, String baseUrl, String resourcePath, JS
 
     public IterableApiRequest(String apiKey, String resourcePath, JSONObject json, String requestType, IterableHelper.SuccessHandler onSuccess, IterableHelper.FailureHandler onFailure) {
         this.apiKey = apiKey;
+        this.baseUrl = null;
         this.resourcePath = resourcePath;
         this.json = json;
         this.requestType = requestType;
@@ -307,6 +308,7 @@ public IterableApiRequest(String apiKey, String resourcePath, JSONObject json, S
 
     public IterableApiRequest(String apiKey, String resourcePath, JSONObject json, String requestType, final IterableHelper.IterableActionHandler callback) {
         this.apiKey = apiKey;
+        this.baseUrl = null;
         this.resourcePath = resourcePath;
         this.json = json;
         this.requestType = requestType;

iterableapi/src/main/java/com/iterable/iterableapi/IterableWebViewClient.java

@@ -1,6 +1,5 @@
 package com.iterable.iterableapi;
 
-import android.net.Uri;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 

iterableapi/src/main/java/com/iterable/iterableapi/ddl/DeviceInfo.java

@@ -6,16 +6,19 @@
 import android.view.Display;
 import android.view.WindowManager;
 
+import androidx.annotation.RestrictTo;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 
+@RestrictTo(RestrictTo.Scope.LIBRARY)
 public class DeviceInfo {
-    String mobileDeviceType = "Android";
-    DeviceFp deviceFp;
+    private static final String MOBILE_DEVICE_TYPE = "Android";
+    private DeviceFp deviceFp;
 
     private DeviceInfo(DeviceFp deviceFp) {
         this.deviceFp = deviceFp;
@@ -78,7 +81,7 @@ private static DeviceFp createDeviceFp(Context context) {
 
     public JSONObject toJSONObject() throws JSONException {
         JSONObject json = new JSONObject();
-        json.put("mobileDeviceType", mobileDeviceType);
+        json.put("mobileDeviceType", MOBILE_DEVICE_TYPE);
         json.put("deviceFp", deviceFp.toJSONObject());
         return json;
     }

iterableapi/src/main/java/com/iterable/iterableapi/util/Future.java

@@ -3,7 +3,6 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;