From 312add468f9e8ec9a6a1421213a7b6c268e9cea7 Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Thu, 18 Jun 2015 00:07:29 +1000
Subject: [PATCH] Update latest OS carrier codes.

---
 carrier                | 8 ++++----
 qml/generic/Search.qml | 8 ++++----
 qml/generic/Title.qml  | 2 +-
 src/search/scanner.cpp | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/carrier b/carrier
index f917cb5..9ffd7b3 100644
--- a/carrier
+++ b/carrier
@@ -1,5 +1,5 @@
-302
-720
+311
+480
 0
-10.3.1.2582
-5
+10.3.2.840
+9
diff --git a/qml/generic/Search.qml b/qml/generic/Search.qml
index 38940bb..989f5fe 100644
--- a/qml/generic/Search.qml
+++ b/qml/generic/Search.qml
@@ -169,7 +169,7 @@ Item {
             property bool githubUpdateComplete: false
             onDevicePresentChanged: if (githubUpdateComplete && devicePresent && searchButton.enabled) searchButton.clicked()
             // Find latest country/carrier pair from github
-            property string latestOS: "10.3.1.1154"
+            property string latestOS: "10.3.2.840"
             Component.onCompleted: {
                 var http = new XMLHttpRequest()
                 var url = "https://raw.githubusercontent.com/xsacha/Sachesi/master/carrier";
@@ -197,7 +197,7 @@ Item {
         TextCouple {
             id: country
             type: qsTr("Country") + translator.lang
-            value: "302"
+            value: "311"
             subtext: carrierinfo.country
             restrictions: Qt.ImhDigitsOnly | Qt.ImhNoPredictiveText
             maxLength: 3
@@ -208,7 +208,7 @@ Item {
         TextCouple {
             id: carrier
             type: qsTr("Carrier") + translator.lang
-            value: "720"
+            value: "480"
             subtext: carrierinfo.carrier
             restrictions: Qt.ImhDigitsOnly | Qt.ImhNoPredictiveText
             maxLength: 3
@@ -275,7 +275,7 @@ Item {
                 TextCoupleSelect {
                     id: variant
                     type: qsTr("Variant") + translator.lang
-                    selectedItem: 5
+                    selectedItem: 9
                     // This is going to be hell to maintain. Maybe an identifier in dev[] for carrier-specific and its associated code?
                     /*onSelectedItemChanged: if (device.text === "Z10 QCOM" && selectedItem == 3) { country.value = "311"; carrier.value = "480" }
                                            else if (device.text === "Q10" && selectedItem == 2) { country.value = "311"; carrier.value = "480" }
diff --git a/qml/generic/Title.qml b/qml/generic/Title.qml
index 2135db2..c8da168 100644
--- a/qml/generic/Title.qml
+++ b/qml/generic/Title.qml
@@ -6,7 +6,7 @@ import "UI" 1.0
 
 ApplicationWindow {
     id: window
-    title: "Sachesi " + version + " Test"
+    title: "Sachesi " + version
     width: 820
     height: 680
     minimumHeight: 540
diff --git a/src/search/scanner.cpp b/src/search/scanner.cpp
index f359900..23e389d 100644
--- a/src/search/scanner.cpp
+++ b/src/search/scanner.cpp
@@ -181,7 +181,7 @@ void Scanner::generatePotentialLinks() {
     appendNewLink(&potentialText, "Z30 + Classic + Leap", "qc8960.wtr5", radioVersion);
     appendNewLink(&potentialText, "Z10 (STL 100-1)", "m5730", radioVersion);
     appendNewLink(&potentialText, "Z10 (STL 100-2/3/4) + P9982", "qc8960", radioVersion);
-    appendNewLink(&potentialText, "Z3 + Kopi/Cafe", "qc8930.wtr5", radioVersion);
+    appendNewLink(&potentialText, "Z3", "qc8930.wtr5", radioVersion);
     // QWERTY
     appendNewLink(&potentialText, "Passport + Ontario", "qc8974.wtr2", radioVersion);
     appendNewLink(&potentialText, "Q5 + Q10 + P9983", "qc8960.wtr", radioVersion);