Hot Fix for NPE

getPaymentOptionsDataManager().getPaymentOptionsResponse() null check
Tap-Payments · Apr 4, 2023 · 2e659fc · 2e659fc
1 parent 32d610c
commit 2e659fc
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 14 deletions.
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Mon Dec 19 15:08:25 AST 2022
+#Tue Apr 04 11:39:46 AST 2023
 gradle.version=5.4.1
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # CHANGELOG
+[3.16.2] - 2023-04-04
+### Hot Fix:
+- Bug fix for NPE 
+### Impact on existing integrations:
+- The update does not impact existing integrations.
+### Recommended changes for existing integrations before updating:
+- None.
 [3.16.1] - 2023-01-23
 ### Enhancement Feature:
 - New Callback added to get when a charge is initiated

diff --git a/README.md b/README.md
@@ -98,7 +98,7 @@ To integrate goSellSDK into your project add it in your **root** `build.gradle`
 Step 2. Add the dependency
 ```java
 	dependencies {
-	        implementation 'com.github.Tap-Payments:goSellSDK-AndroidX:3.16.1'
+	        implementation 'com.github.Tap-Payments:goSellSDK-AndroidX:3.16.2'
 	}
 ```
 

diff --git a/library/build.gradle b/library/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
+
 group = 'com.github.Tap-Payments'
 def getVersionName = { ->
     try {
@@ -22,6 +23,7 @@ android {
         versionCode 2
         versionName getVersionName()
         consumerProguardFiles 'proguard-rules.pro'
+        multiDexEnabled true
 
     }
     buildTypes {
@@ -73,6 +75,11 @@ dependencies {
     implementation 'org.jetbrains:annotations:15.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
+
+
+
+    implementation 'androidx.multidex:multidex:2.0.1'
+
 }
 
 task sourcesJar(type: Jar) {

diff --git a/library/src/main/java/company/tap/gosellapi/internal/activities/GoSellPaymentActivity.java b/library/src/main/java/company/tap/gosellapi/internal/activities/GoSellPaymentActivity.java
@@ -125,6 +125,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         overridePendingTransition(R.anim.slide_in_top, android.R.anim.fade_out);
         setupScreenMode();
+        if(ThemeObject.getInstance().getAppearanceMode()!=null)
         apperanceMode = ThemeObject.getInstance().getAppearanceMode();
 
         if (apperanceMode == AppearanceMode.WINDOWED_MODE) {
@@ -265,7 +266,8 @@ private void setupHeader() {
 
         } else {
             String logoPath = "";
-            if (PaymentDataManager.getInstance().getPaymentOptionsDataManager().getPaymentOptionsResponse() != null &&
+
+            if (PaymentDataManager.getInstance().getPaymentOptionsDataManager()!=null && PaymentDataManager.getInstance().getPaymentOptionsDataManager().getPaymentOptionsResponse() != null &&
                     PaymentDataManager.getInstance().getPaymentOptionsDataManager().getPaymentOptionsResponse().getMerchant() != null &&
                     PaymentDataManager.getInstance().getPaymentOptionsDataManager().getPaymentOptionsResponse().getMerchant().getLogo() != null
             ) {
@@ -289,6 +291,7 @@ private void setupHeader() {
             businessName.setTextSize(ThemeObject.getInstance().getHeaderTextSize());
         if (ThemeObject.getInstance().getHeaderBackgroundColor() != 0)
             toolbar.setBackgroundColor(ThemeObject.getInstance().getHeaderBackgroundColor());
+
     }
 
     private void setupPayButton() {
@@ -477,19 +480,21 @@ private void startCardPaymentProcess(CardCredentialsViewModel paymentOptionViewM
 
     ///////////////////////////////////////////////////  start function that initiate payment by creating charge --------------------------
     private void getVisibleViewModels() {
-        for (int i = 0; i < PaymentDataManager.getInstance().getPaymentOptionsDataManager().getSize(); i++) {
-            if (PaymentDataManager.getInstance().getPaymentOptionsDataManager().getViewModel(i) instanceof RecentSectionViewModel) {
-                recentSectionViewModel = (RecentSectionViewModel) PaymentDataManager.getInstance().getPaymentOptionsDataManager().getViewModel(i);
+        if(PaymentDataManager.getInstance().getPaymentOptionsDataManager()!=null && PaymentDataManager.getInstance().getPaymentOptionsDataManager().getSize()>0) {
+            for (int i = 0; i < PaymentDataManager.getInstance().getPaymentOptionsDataManager().getSize(); i++) {
+                if (PaymentDataManager.getInstance().getPaymentOptionsDataManager().getViewModel(i) instanceof RecentSectionViewModel) {
+                    recentSectionViewModel = (RecentSectionViewModel) PaymentDataManager.getInstance().getPaymentOptionsDataManager().getViewModel(i);
 
-            } else if (PaymentDataManager.getInstance().getPaymentOptionsDataManager().getViewModel(i) instanceof GroupViewModel) {
-                groupViewModel = (GroupViewModel) PaymentDataManager.getInstance().getPaymentOptionsDataManager().getViewModel(i);
+                } else if (PaymentDataManager.getInstance().getPaymentOptionsDataManager().getViewModel(i) instanceof GroupViewModel) {
+                    groupViewModel = (GroupViewModel) PaymentDataManager.getInstance().getPaymentOptionsDataManager().getViewModel(i);
 
-            } else if (PaymentDataManager.getInstance().getPaymentOptionsDataManager().getViewModel(i) instanceof WebPaymentViewModel) {
-                webPaymentViewModel = (WebPaymentViewModel) PaymentDataManager.getInstance().getPaymentOptionsDataManager().getViewModel(i);
+                } else if (PaymentDataManager.getInstance().getPaymentOptionsDataManager().getViewModel(i) instanceof WebPaymentViewModel) {
+                    webPaymentViewModel = (WebPaymentViewModel) PaymentDataManager.getInstance().getPaymentOptionsDataManager().getViewModel(i);
 
-            } else if (PaymentDataManager.getInstance().getPaymentOptionsDataManager().getViewModel(i) instanceof CardCredentialsViewModel) {
-                cardCredentialsViewModel = (CardCredentialsViewModel) PaymentDataManager.getInstance().getPaymentOptionsDataManager().getViewModel(i);
+                } else if (PaymentDataManager.getInstance().getPaymentOptionsDataManager().getViewModel(i) instanceof CardCredentialsViewModel) {
+                    cardCredentialsViewModel = (CardCredentialsViewModel) PaymentDataManager.getInstance().getPaymentOptionsDataManager().getViewModel(i);
 
+                }
             }
         }
     }