Code cleanup refactoring, null checks, and other lint adjustments (#1180)

Author: Langston Smith

MapboxAndroidDemo/src/androidTest/java/com/mapbox/mapboxsdk/testapp/BaseActivityTest.java

@@ -10,13 +10,11 @@
 import com.mapbox.mapboxsdk.testapp.action.WaitAction;
 import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource;
 
-import junit.framework.Assert;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 
-import androidx.test.espresso.Espresso;
+import androidx.test.espresso.IdlingRegistry;
 import androidx.test.espresso.IdlingResourceTimeoutException;
 import androidx.test.rule.ActivityTestRule;
 import timber.log.Timber;
@@ -25,21 +23,23 @@
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 
 public abstract class BaseActivityTest {
 
   @Rule
   public ActivityTestRule<Activity> rule = new ActivityTestRule<>(getActivityClass());
-  protected MapboxMap mapboxMap;
-  protected OnMapReadyIdlingResource idlingResource;
+  private MapboxMap mapboxMap;
+  private OnMapReadyIdlingResource idlingResource;
 
   @Before
   public void beforeTest() {
     try {
       Timber.e("@Before test: register idle resource");
       idlingResource = new OnMapReadyIdlingResource(rule.getActivity());
-      Espresso.registerIdlingResources(idlingResource);
+      IdlingRegistry.getInstance().register(idlingResource);
       checkViewIsDisplayed(R.id.mapView);
       mapboxMap = idlingResource.getMapboxMap();
     } catch (IdlingResourceTimeoutException idlingResourceTimeoutException) {
@@ -54,9 +54,9 @@ public void beforeTest() {
   }
 
   protected void validateTestSetup() {
-    Assert.assertTrue("Device is not connected to the Internet.", isConnected(rule.getActivity()));
+    assertTrue("Device is not connected to the Internet.", isConnected(rule.getActivity()));
     checkViewIsDisplayed(R.id.mapView);
-    Assert.assertNotNull(mapboxMap);
+    assertNotNull(mapboxMap);
   }
 
   protected MapboxMap getMapboxMap() {
@@ -87,7 +87,7 @@ static boolean isConnected(Context context) {
   @After
   public void afterTest() {
     Timber.e("@After test: unregister idle resource");
-    Espresso.unregisterIdlingResources(idlingResource);
+    IdlingRegistry.getInstance().unregister(idlingResource);
   }
 }
 

MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/MainActivity.java

@@ -193,7 +193,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
   private ExampleAdapter adapter;
   private RecyclerView recyclerView;
   private TextView noExamplesTv;
-  private NavigationView navigationView;
 
   private boolean loggedIn;
   private int currentCategory = R.id.nav_basics;
@@ -267,7 +266,7 @@ public void onItemClicked(RecyclerView recyclerView, int position, View view) {
     }
     toggle.syncState();
 
-    navigationView = findViewById(R.id.nav_view);
+    NavigationView navigationView = findViewById(R.id.nav_view);
     if (navigationView != null) {
       navigationView.setNavigationItemSelectedListener(this);
       navigationView.setCheckedItem(R.id.nav_basics);

MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/MapboxApplication.java

@@ -23,7 +23,13 @@ public void onCreate() {
       setUpCrashlytics();
     }
     Mapbox.getInstance(this, getString(R.string.access_token));
-    Mapbox.getTelemetry().setDebugLoggingEnabled(true);
+    if (BuildConfig.DEBUG) {
+      if (Mapbox.getTelemetry() == null) {
+        throw new RuntimeException("Mapbox.getTelemetry() == null in debug config");
+      } else {
+        Mapbox.getTelemetry().setDebugLoggingEnabled(true);
+      }
+    }
     setUpTileLoadingMeasurement();
   }
 

MapboxAndroidDemo/src/global/java/com/mapbox/mapboxandroiddemo/account/LandingActivity.java

@@ -4,9 +4,6 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import androidx.browser.customtabs.CustomTabsIntent;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.app.AppCompatActivity;
 import android.widget.CheckBox;
 import android.widget.Toast;
 
@@ -16,6 +13,10 @@
 import com.mapbox.mapboxandroiddemo.R;
 import com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.core.content.ContextCompat;
+
 import static com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker.CLICKED_ON_CREATE_ACCOUNT_BUTTON;
 import static com.mapbox.mapboxandroiddemo.commons.AnalyticsTracker.CLICKED_ON_SIGN_IN_BUTTON;
 import static com.mapbox.mapboxandroiddemo.commons.StringConstants.AUTHCODE_KEY;
@@ -35,7 +36,6 @@ public class LandingActivity extends AppCompatActivity {
   private static final String REDIRECT_URI = "mapbox-android-dev-preview://authorize";
   private static String CREATE_ACCOUNT_AUTH_URL;
   private boolean loggedIn;
-  private boolean alreadyIgnoredLandingAsk;
   private boolean ignoreCheckboxIsChecked;
   private AnalyticsTracker analytics;
 
@@ -48,7 +48,7 @@ protected void onCreate(Bundle savedInstanceState) {
       getApplicationContext())
       .getBoolean(TOKEN_SAVED_KEY, false);
 
-    alreadyIgnoredLandingAsk = PreferenceManager.getDefaultSharedPreferences(
+    boolean alreadyIgnoredLandingAsk = PreferenceManager.getDefaultSharedPreferences(
       getApplicationContext())
       .getBoolean(LOGIN_SIGNIN_IGNORE_KEY, false);
 
@@ -60,7 +60,9 @@ protected void onCreate(Bundle savedInstanceState) {
     if (!loggedIn && !alreadyIgnoredLandingAsk || getIntent().getBooleanExtra(
       FROM_LOGIN_SCREEN_MENU_ITEM_KEY, false)) {
       setContentView(R.layout.activity_landing);
-      getSupportActionBar().hide();
+      if (getSupportActionBar() != null) {
+        getSupportActionBar().hide();
+      }
       buildAccountAuthUrl();
       setUpButtons();
     } else {
@@ -81,18 +83,20 @@ protected void onResume() {
       Toast.makeText(getApplicationContext(), R.string.log_out_toast_confirm, Toast.LENGTH_LONG).show();
     } else if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_VIEW)) {
       Uri uri = getIntent().getData();
-      String error = uri.getQueryParameter("error");
-      if (error != null) {
-        showErrorDialog();
-      } else {
-        String authCode = uri.getQueryParameter("code");
-        Intent intent = new Intent(this, AccountRetrievalService.class);
-        intent.putExtra(AUTHCODE_KEY, authCode);
-        intent.putExtra(REDIRECT_URI_KEY, REDIRECT_URI);
-        intent.putExtra(CLIENT_ID_KEY, CLIENT_ID);
-        startService(intent);
-        Intent loadingActivityIntent = new Intent(this, LoadingActivity.class);
-        startActivity(loadingActivityIntent);
+      if (uri != null) {
+        String error = uri.getQueryParameter("error");
+        if (error != null) {
+          showErrorDialog();
+        } else {
+          String authCode = uri.getQueryParameter("code");
+          Intent intent = new Intent(this, AccountRetrievalService.class);
+          intent.putExtra(AUTHCODE_KEY, authCode);
+          intent.putExtra(REDIRECT_URI_KEY, REDIRECT_URI);
+          intent.putExtra(CLIENT_ID_KEY, CLIENT_ID);
+          startService(intent);
+          Intent loadingActivityIntent = new Intent(this, LoadingActivity.class);
+          startActivity(loadingActivityIntent);
+        }
       }
     }
   }

MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/account/LoadingActivity.java

@@ -13,7 +13,9 @@ public class LoadingActivity extends AppCompatActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    getSupportActionBar().setDisplayShowTitleEnabled(false);
+    if (getSupportActionBar() != null) {
+      getSupportActionBar().setDisplayShowTitleEnabled(false);
+    }
     setContentView(R.layout.activity_loading);
   }
 }

MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/basics/SupportMapFragmentActivity.java

@@ -53,20 +53,21 @@ protected void onCreate(Bundle savedInstanceState) {
       mapFragment = (SupportMapFragment) getSupportFragmentManager().findFragmentByTag("com.mapbox.map");
     }
 
-    mapFragment.getMapAsync(new OnMapReadyCallback() {
-      @Override
-      public void onMapReady(@NonNull MapboxMap mapboxMap) {
+    if (mapFragment != null) {
+      mapFragment.getMapAsync(new OnMapReadyCallback() {
+        @Override
+        public void onMapReady(@NonNull MapboxMap mapboxMap) {
+          mapboxMap.setStyle(Style.SATELLITE, new Style.OnStyleLoaded() {
+            @Override
+            public void onStyleLoaded(@NonNull Style style) {
 
-        mapboxMap.setStyle(Style.SATELLITE, new Style.OnStyleLoaded() {
-          @Override
-          public void onStyleLoaded(@NonNull Style style) {
+              // Map is set up and the style has loaded. Now you can add data or make other map adjustments
 
-            // Map is set up and the style has loaded. Now you can add data or make other map adjustments
 
-
-          }
-        });
-      }
-    });
+            }
+          });
+        }
+      });
+    }
   }
 }

MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/DrawGeojsonLineActivity.java

@@ -63,17 +63,19 @@ public void onStyleLoaded(@NonNull Style style) {
   private void drawLines(@NonNull FeatureCollection featureCollection) {
     if (mapboxMap != null) {
       mapboxMap.getStyle(style -> {
-        if (featureCollection.features().size() > 0) {
-          style.addSource(new GeoJsonSource("line-source", featureCollection));
-
-          // The layer properties for our line. This is where we make the line dotted, set the
-          // color, etc.
-          style.addLayer(new LineLayer("linelayer", "line-source")
-            .withProperties(PropertyFactory.lineCap(Property.LINE_CAP_SQUARE),
-              PropertyFactory.lineJoin(Property.LINE_JOIN_MITER),
-              PropertyFactory.lineOpacity(.7f),
-              PropertyFactory.lineWidth(7f),
-              PropertyFactory.lineColor(Color.parseColor("#3bb2d0"))));
+        if (featureCollection.features() != null) {
+          if (featureCollection.features().size() > 0) {
+            style.addSource(new GeoJsonSource("line-source", featureCollection));
+
+            // The layer properties for our line. This is where we make the line dotted, set the
+            // color, etc.
+            style.addLayer(new LineLayer("linelayer", "line-source")
+              .withProperties(PropertyFactory.lineCap(Property.LINE_CAP_SQUARE),
+                PropertyFactory.lineJoin(Property.LINE_JOIN_MITER),
+                PropertyFactory.lineOpacity(.7f),
+                PropertyFactory.lineWidth(7f),
+                PropertyFactory.lineColor(Color.parseColor("#3bb2d0"))));
+          }
         }
       });
     }

MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/dds/ExpressionIntegrationActivity.java

@@ -183,26 +183,28 @@ protected FeatureCollection doInBackground(Void... voids) {
 
           // Find out the states represented in the FeatureCollection
           // and bounds of the extreme conditions
-          for (Feature feature : featureCollection.features()) {
-            String stateName = feature.getStringProperty("state");
-            String lat = feature.getStringProperty("latitude");
-            String lon = feature.getStringProperty("longitude");
-
-            LatLng latLng = new LatLng(
-              Double.parseDouble(lat),
-              Double.parseDouble(lon));
-
-            State state = null;
-            for (State curState : activity.states) {
-              if (curState.name.equals(stateName)) {
-                state = curState;
-                break;
+          if (featureCollection.features() != null) {
+            for (Feature feature : featureCollection.features()) {
+              String stateName = feature.getStringProperty("state");
+              String lat = feature.getStringProperty("latitude");
+              String lon = feature.getStringProperty("longitude");
+
+              LatLng latLng = new LatLng(
+                Double.parseDouble(lat),
+                Double.parseDouble(lon));
+
+              State state = null;
+              for (State curState : activity.states) {
+                if (curState.name.equals(stateName)) {
+                  state = curState;
+                  break;
+                }
+              }
+              if (state == null) {
+                activity.states.add(activity.createState(stateName, latLng));
+              } else {
+                state.add(latLng);
               }
-            }
-            if (state == null) {
-              activity.states.add(activity.createState(stateName, latLng));
-            } else {
-              state.add(latLng);
             }
           }
           return featureCollection;
@@ -292,12 +294,16 @@ private void changeTemperatureUnits(boolean isImperial, @NonNull Style loadedMap
 
       // Apply new units to the data displayed in text fields of SymbolLayers
       SymbolLayer maxTempLayer = (SymbolLayer) loadedMapStyle.getLayer(MAX_TEMP_LAYER_ID);
-      maxTempLayer.withProperties(textField(getTemperatureValue()));
+      if (maxTempLayer != null) {
+        maxTempLayer.withProperties(textField(getTemperatureValue()));
+      }
 
       SymbolLayer minTempLayer = (SymbolLayer) loadedMapStyle.getLayer(MIN_TEMP_LAYER_ID);
-      minTempLayer.withProperties(textField(getTemperatureValue()));
-
+      if (minTempLayer != null) {
+        minTempLayer.withProperties(textField(getTemperatureValue()));
+      }
       unitsText.setText(isImperial ? DEGREES_C : DEGREES_F);
+
     }
   }
 
@@ -403,31 +409,33 @@ private void selectState(CharSequence stateName, int stateIndex, @NonNull Style
       // Adds a SymbolLayer to display maximum temperature in state
       SymbolLayer maxTempLayer = (SymbolLayer) loadedMapStyle.getLayer(MAX_TEMP_LAYER_ID);
       // Only display Maximum Temperature in this layer for SELECTED State
-      maxTempLayer.setFilter(all(
-        eq(get("element"), literal("All-Time Maximum Temperature")),
-        eq(get("state"), literal(stateName))));
-
+      if (maxTempLayer != null) {
+        maxTempLayer.setFilter(all(
+          eq(get("element"), literal("All-Time Maximum Temperature")),
+          eq(get("state"), literal(stateName))));
+      }
 
       // Adds a SymbolLayer to display minimum temperature in state
       SymbolLayer minTempLayer = (SymbolLayer) loadedMapStyle.getLayer(MIN_TEMP_LAYER_ID);
       // Only display Maximum Temperature in this layer for SELECTED State
-      minTempLayer.setFilter(all(
-        eq(get("element"), literal("All-Time Minimum Temperature")),
-        eq(get("state"), literal(stateName))));
+      if (minTempLayer != null) {
+        minTempLayer.setFilter(all(
+          eq(get("element"), literal("All-Time Minimum Temperature")),
+          eq(get("state"), literal(stateName))));
+      }
 
       CameraUpdate cameraUpdate =
         CameraUpdateFactory.newLatLngBounds(states.get(stateIndex).bounds, 100);
       mapboxMap.animateCamera(cameraUpdate);
 
       Toast.makeText(this,
         String.format(getString(R.string.temp_change_feedback), stateName),
-        Toast.LENGTH_LONG)
-        .show();
+        Toast.LENGTH_LONG).show();
     }
   }
 
   private int indexOfState(CharSequence name) {
-    if (states != null && name != null) {
+    if (name != null) {
       for (int i = 0; i < states.size(); i++) {
         if (name.equals(states.get(i).name)) {
           return i;