fixed runtime error. Close #4

fevziomurtekin · Jun 18, 2020 · c436927 · c436927
1 parent b4f0067
commit c436927
Show file tree

Hide file tree

Showing 5 changed files with 160 additions and 17 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/payview/src/main/java/com/fevziomurtekin/payview/Payview.kt b/payview/src/main/java/com/fevziomurtekin/payview/Payview.kt
@@ -382,22 +382,24 @@ class Payview : NestedScrollView, View.OnFocusChangeListener {
     private fun checkCardType(cardNo: String?){
         when(cardNo?.substring(0,1).toString().toInt()){
             3->{
-                when(cardNo?.substring(0,2)?.toInt()){
-                    in 30..38->{
-                        cardType = CardType.DINNERSCLUB
-                        iv_card_type.setImageResource(R.drawable.ic_dinners)
-                    }
-                    35->{
-                        cardType = CardType.JCB
-                        iv_card_type.setImageResource(R.drawable.ic_jcb)
-                    }
-                    37->{
-                        cardType = CardType.AMERICANEXPRESS
-                        iv_card_type.setImageResource(R.drawable.ic_american_express)
-                    }
-                    else->{
-                        cardType = CardType.UNDEFINED
-                        iv_card_type.setImageResource(R.drawable.ic_warning)
+                if(cardNo?.length!! > 2) {
+                    when (cardNo?.substring(0, 2)?.toInt()) {
+                        in 30..38 -> {
+                            cardType = CardType.DINNERSCLUB
+                            iv_card_type.setImageResource(R.drawable.ic_dinners)
+                        }
+                        35 -> {
+                            cardType = CardType.JCB
+                            iv_card_type.setImageResource(R.drawable.ic_jcb)
+                        }
+                        37 -> {
+                            cardType = CardType.AMERICANEXPRESS
+                            iv_card_type.setImageResource(R.drawable.ic_american_express)
+                        }
+                        else -> {
+                            cardType = CardType.UNDEFINED
+                            iv_card_type.setImageResource(R.drawable.ic_warning)
+                        }
                     }
                 }
             }