From 8b58427bd9f9337b4344b3f90e2b2e22529a4d47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?mustafa=20ic=CC=A7men?= <mustafaicmen@gmail.com>
Date: Sun, 26 Jan 2020 23:48:40 +0300
Subject: [PATCH] cart total null fix for braintree payment

---
 .idea/caches/build_file_checksums.ser         | Bin 542 -> 542 bytes
 .idea/caches/gradle_models.ser                | Bin 318083 -> 318083 bytes
 app/build.gradle                              |   4 ++--
 app/release/output.json                       |   2 +-
 .../android/model/cart/CartTotalModel.java    |   6 ++++++
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 1ae47165fbebbc9392def1087ac3b30ad9751e89..9a3a5f467cb31ab22de951e4e04d2a58bdbae578 100644
GIT binary patch
delta 32
qcmV+*0N?+f1fB$tnFE?TrLmlG0TJiV{<Quq;PD?&+`=>9iZOWoBoJ``

delta 32
ocmbQoGLL1#Oy&>;^Nn)~83lC~$3963++-wr^Fn%mOZBV@0LI-7S^xk5

diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index 8c34d9549bab26a6a2be8ef88c529cf316dd7218..e6060728f154ad0ee2da1a821c6577a2ca85613f 100644
GIT binary patch
delta 200
zcmZqPD%`wPc*A~mE`_gg0Sq9(I6cvaMSJrX^}mWN&tf*IZT{+chKI%F!e`;lN5d+a
zgoH~NSPb=yOp6N{>KLu&|BvLD+-MuKc}?UJF20B9^IkK6#EnWASW_n38;dp<r?eNR
zFaj|X5HoKtPGQ-c!?xw>i>r(U(*s?Yg}2*ZWYJ}k5zjZ209q~t(yRj{m~Mj17yMhG
paY$x*$7Pl!j6&1(d{`vd#I#Os+kRrY_Z5~*u%ou`xWaOp6#y!hNEHA8

delta 200
zcmZqPD%`wPc*A~mt|>q5Co+Hl<Mc!y7VXVn)c-27@az?1+Wgh?3=hkdg1PTE9}TNy
z5)vw5U@_D)GAJ%&sAII6|38vra-(g`<~5N^xcDMxt1e>zi5rzLu%=A5Hx_L!PH8Vr
zVFY3(AZFfPoWim>hfTg`(>2C|>47fH!rSdHvgk6&R4qSh4zyelq*(_@Fx>>1FZj1W
p<B;_9j>{}d7zL;6`LIZ^iD~J)_kKRz`wB}Y*iqYeTwyuQ3IMFjM^OL(

diff --git a/app/build.gradle b/app/build.gradle
index 802f79f..5daf099 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,8 +22,8 @@ android {
         applicationId "ch.pizzaleu.android"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode  18 // play store'daki version --> canlı: 0  - dahili test: 17
-        versionName "1.20"   // play store'daki version --> canlı: 0.00 -  dahili test: 1.17
+        versionCode  19 // play store'daki version --> canlı: 0  - dahili test: 17
+        versionName "1.25"   // play store'daki version --> canlı: 0.00 -  dahili test: 1.17
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         manifestPlaceholders = [
diff --git a/app/release/output.json b/app/release/output.json
index 47037a4..88ecfaa 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":18,"versionName":"1.20","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":19,"versionName":"1.25","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/ch/pizzaleu/android/model/cart/CartTotalModel.java b/app/src/main/java/ch/pizzaleu/android/model/cart/CartTotalModel.java
index ebc6730..a69e3cc 100644
--- a/app/src/main/java/ch/pizzaleu/android/model/cart/CartTotalModel.java
+++ b/app/src/main/java/ch/pizzaleu/android/model/cart/CartTotalModel.java
@@ -17,6 +17,9 @@ public class CartTotalModel implements Serializable {
     }
 
     public String getTitle() {
+        if(title == null){
+            title = "";
+        }
         return title;
     }
 
@@ -25,6 +28,9 @@ public class CartTotalModel implements Serializable {
     }
 
     public String getText() {
+        if(text == null){
+            text = "";
+        }
         return text;
     }