From 335c2e8e6377a2f2b5809a10014e9536ce5f469a Mon Sep 17 00:00:00 2001
From: Sara Damiano <sdamiano@stroudcenter.org>
Date: Wed, 15 Apr 2020 09:16:56 -0400
Subject: [PATCH] Fix CCID for SIM800, fixes #336

Signed-off-by: Sara Damiano <sdamiano@stroudcenter.org>
---
 .github/ISSUE_TEMPLATE.md |  2 +-
 library.json              |  2 +-
 library.properties        |  2 +-
 src/TinyGsmClientSIM800.h | 14 +++++++++++++-
 src/TinyGsmCommon.h       |  2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 98b342b..75e2d06 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -22,7 +22,7 @@ with your board before submitting any issues.
 
 Main processor board: <!-- Uno, Zero, ESP32, Particle, etc -->
 Modem: <!-- Brand, model, variant, firmware version -->
-TinyGSM version: <!-- always try to use the latest (0.10.2) -->
+TinyGSM version: <!-- always try to use the latest (0.10.3) -->
 Code: <!-- Example name or paste in your code -->
 
 ### Scenario, steps to reproduce
diff --git a/library.json b/library.json
index d9f01fe..3fe8855 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "TinyGSM",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "description": "A small Arduino library for GPRS modules, that just works. Includes examples for Blynk, MQTT, File Download, and Web Client. Supports many GSM, LTE, and WiFi modules with AT command interfaces.",
   "keywords": "GSM, AT commands, AT, SIM800, SIM900, A6, A7, M590, ESP8266, SIM7000, SIM800A, SIM800C, SIM800L, SIM800H, SIM808, SIM868, SIM900A, SIM900D, SIM908, SIM968, M95, MC60, MC60E, BG96, ublox, Quectel, SIMCOM, AI Thinker, LTE, LTE-M",
   "authors":
diff --git a/library.properties b/library.properties
index 8b1fd67..d84e1d2 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=TinyGSM
-version=0.10.2
+version=0.10.3
 author=Volodymyr Shymanskyy
 maintainer=Volodymyr Shymanskyy
 sentence=A small Arduino library for GPRS modules, that just works.
diff --git a/src/TinyGsmClientSIM800.h b/src/TinyGsmClientSIM800.h
index 4878afa..4c47d38 100644
--- a/src/TinyGsmClientSIM800.h
+++ b/src/TinyGsmClientSIM800.h
@@ -392,7 +392,19 @@ class TinyGsmSim800 : public TinyGsmModem<TinyGsmSim800>,
    * SIM card functions
    */
  protected:
-  // Able to follow all SIM card functions as inherited from the template
+  // May not return the "+CCID" before the number
+  String getSimCCIDImpl() {
+    sendAT(GF("+CCID"));
+    if (waitResponse(GF(GSM_NL)) != 1) {
+      return "";
+    }
+    String res = stream.readStringUntil('\n');
+    waitResponse();
+    // Trim out the CCID header in case it is there
+    res.replace("CCID:", "");
+    res.trim();
+    return res;
+  }
 
   /*
    * Phone Call functions
diff --git a/src/TinyGsmCommon.h b/src/TinyGsmCommon.h
index 00679f1..f24dca3 100644
--- a/src/TinyGsmCommon.h
+++ b/src/TinyGsmCommon.h
@@ -10,7 +10,7 @@
 #define SRC_TINYGSMCOMMON_H_
 
 // The current library version number
-#define TINYGSM_VERSION "0.10.2"
+#define TINYGSM_VERSION "0.10.3"
 
 #if defined(SPARK) || defined(PARTICLE)
 #include "Particle.h"