[2.0.2] Fix NPE in LyftButton#displayCost (#27)

* version bump

* Fix NPE on displayCost

* Prepare for release 2.0.2

* Update CHANGELOG.md

Co-authored-by: Ezra Fernandez <[email protected]>

Co-authored-by: Ezra Fernandez <[email protected]>

Author: slowhill

CHANGELOG.md

@@ -1,3 +1,7 @@
+Version 2.0.2 *(2020-09-20)*
+----------------------------
+* Fixed a bug that caused an NPE when attempting to display a price on the Lyft Button.
+
 Version 2.0.1 *(2019-11-18)*
 ----------------------------
 * Fixed a bug that prevented promo codes from being applied to the Lyft Button.

README.md

@@ -19,22 +19,22 @@ repositories {
 }
 
 dependencies {
-    compile 'com.lyft:lyft-android-sdk:2.0.1'
+    compile 'com.lyft:lyft-android-sdk:2.0.2'
 }
 ```
 
 If you only want to use the [Lyft API Wrapper](https://github.com/lyft/lyft-android-sdk#lyft-api-wrapper) or [Deeplink](https://github.com/lyft/lyft-android-sdk#deeplinking) portion of the SDK, you can pull them individually.
 ```gradle
-compile 'com.lyft:lyft-android-sdk-networking:2.0.1'  // Lyft API Wrapper
-compile 'com.lyft:lyft-android-sdk-deeplink:2.0.1'    // Deeplink
+compile 'com.lyft:lyft-android-sdk-networking:2.0.2'  // Lyft API Wrapper
+compile 'com.lyft:lyft-android-sdk-deeplink:2.0.2'    // Deeplink
 ```
 
 ### Maven:
 ```xml
 <dependency>
   <groupId>com.lyft</groupId>
   <artifactId>lyft-android-sdk</artifactId>
-  <version>2.0.1</version>
+  <version>2.0.2</version>
   <type>aar</type>
 </dependency>
 ```

build.gradle

@@ -39,7 +39,7 @@ subprojects {
     ext.googlePlayVersion = '17.0.0'
     ext.jetbrainsVersion = '15.0'
     ext.junitVersion = '4.12'
-    ext.lyftSdkVersionCode = 2
+    ext.lyftSdkVersionCode = 3
     ext.lyftSdkVersionName = VERSION_NAME
     ext.mockitoVersion = '2.25.0'
     ext.okhttpVersion = '3.3.1'

deeplink/src/main/java/com/lyft/deeplink/DeepLink.java

@@ -9,7 +9,7 @@
 public class DeepLink {
 
     private static final String LYFT_PACKAGE_NAME = "me.lyft.android";
-    private static final String SDK_VERSION = "2.0.1";
+    private static final String SDK_VERSION = BuildConfig.VERSION_NAME;
 
     /**
      * @return true if Lyft app is installed on the device.

gradle.properties

@@ -1,5 +1,5 @@
 GROUP=com.lyft
-VERSION_NAME=2.0.1
+VERSION_NAME=2.0.2
 
 POM_DESCRIPTION=Lyft Android SDK
 

lyft-button/src/main/java/com/lyft/lyftbutton/LyftButton.java

@@ -4,6 +4,7 @@
 import android.content.res.TypedArray;
 import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.ImageView;
@@ -174,11 +175,22 @@ public void onFailure(Throwable t) {
 
     private void displayEta(Eta eta) {
         int etaMinutes = eta.eta_seconds / 60;
-        rideTypeEtaText.setText(String.valueOf(
-                getResources().getString(R.string.ridetype_eta_text, eta.display_name, etaMinutes)));
+        rideTypeEtaText.setText(getResources().getString(R.string.ridetype_eta_text, eta.display_name, etaMinutes));
     }
 
     private void displayCost(CostEstimate costEstimate) {
+        if (costEstimate.estimated_cost_cents_max == null
+                || costEstimate.estimated_cost_cents_min == null) {
+            Log.w(
+                    LyftButton.class.getName(),
+                    String.format(
+                            "Required fields from Cost Estimate has returned as null. Estimated cost must be non-null to display the cost. %s",
+                            costEstimate.toString())
+            );
+
+            return;
+        }
+
         costContainer.setVisibility(VISIBLE);
 
         if (TextUtils.isEmpty(costEstimate.primetime_percentage) || "0%".equals(costEstimate.primetime_percentage)) {
@@ -190,10 +202,10 @@ private void displayCost(CostEstimate costEstimate) {
         float minCost = costEstimate.estimated_cost_cents_min / 100f;
         float maxCost = costEstimate.estimated_cost_cents_max / 100f;
         if (minCost == maxCost) {
-            costText.setText(String.valueOf(getResources().getString(R.string.fixed_cost_amount, minCost)));
+            costText.setText(getResources().getString(R.string.fixed_cost_amount, minCost));
         } else {
             costText.setText(
-                    String.valueOf(getResources().getString(R.string.cost_estimate_range, (int) minCost, (int) maxCost)));
+                    getResources().getString(R.string.cost_estimate_range, (int) minCost, (int) maxCost));
         }
     }
 

networking/build.gradle

@@ -1,8 +1,26 @@
-apply plugin: 'java'
+apply plugin: 'com.android.library'
 
 targetCompatibility = '1.7'
 sourceCompatibility = '1.7'
 
+android {
+    compileSdkVersion androidCompileSDK
+    buildToolsVersion androidBuildToolsVersion
+
+    defaultConfig {
+        minSdkVersion androidMinSdk
+        targetSdkVersion androidTargetSDK
+        versionCode lyftSdkVersionCode
+        versionName lyftSdkVersionName
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
 dependencies {
     implementation 'org.jetbrains:annotations-java5:' + jetbrainsVersion
     implementation 'com.squareup.okhttp3:okhttp:' + okhttpVersion

networking/src/main/java/com/lyft/networking/RequestInterceptor.java

@@ -9,7 +9,7 @@ class RequestInterceptor implements Interceptor {
 
     static final String AUTHORIZATION_HEADER = "Authorization";
     static final String USER_AGENT_HEADER = "User-Agent";
-    private static final String USER_AGENT = "lyft-mobile-sdk:android::2.0.0";
+    private static final String USER_AGENT = String.format("lyft-mobile-sdk:android::%s", BuildConfig.VERSION_NAME);
     private final String clientToken;
 
     RequestInterceptor(String clientToken) {

test-utils/build.gradle

@@ -1,8 +1,26 @@
-apply plugin: 'java'
+apply plugin: 'com.android.library'
 
 targetCompatibility = '1.7'
 sourceCompatibility = '1.7'
 
+android {
+    compileSdkVersion androidCompileSDK
+    buildToolsVersion androidBuildToolsVersion
+
+    defaultConfig {
+        minSdkVersion androidMinSdk
+        targetSdkVersion androidTargetSDK
+        versionCode lyftSdkVersionCode
+        versionName lyftSdkVersionName
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
 dependencies {
     implementation 'com.squareup.retrofit2:retrofit-mock:' + retrofitVersion
     implementation project(path: ':networking')