Merge lp:~radonapps/dialer-app/keyentry_clear into lp:dialer-app

[Daniyaal Rasheed]

Keypad Entry is passed by reference to the call function so that the value can be cleared inside the function when a call successfully initiates.

[Tiago Salem Herrmann (tiagosh)]

Thanks for the patch.

Unfortunately the original bug remains. The keypad entry still contains the value after an USSD command is invoked. (it returns before keypadEntry.value is cleared)

Apart from that, there is one place where you forgot to replace "number" by keypadEntry.value.

To make the diff smaller you could define var number = keypadEntry.value in the beginning of call().

As a suggestion, how about return true or false in the call() function (indicating if the number was actually called) and in DialerPage.qml simply clear the entry if the call method returned true?

review: Needs Fixing

[lp:~radonapps/dialer-app/keyentry_clear]

509. By Daniyaal Rasheed on 2016-01-18

Fixed issues with clearing keypadEntry before USSD returns

Unmerged revisions

509. By Daniyaal Rasheed on 2016-01-18

Fixed issues with clearing keypadEntry before USSD returns

508. By Daniyaal Rasheed on 2016-01-17

keypadEntry is cleared when after the user successfully starts a call

=== modified file 'src/qml/DialerPage/DialerPage.qml'
--- src/qml/DialerPage/DialerPage.qml	2016-01-05 16:22:42 +0000
+++ src/qml/DialerPage/DialerPage.qml	2016-01-18 15:13:38 +0000
@@ -468,7 +468,8 @@
                 }
 
                 console.log("Starting a call to " + keypadEntry.value);
-                mainView.call(keypadEntry.value);
+                if (mainView.call(keypadEntry.value))
+                    keypadEntry.value = ""
             }
         }
     }

=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2015-11-03 13:39:11 +0000
+++ src/qml/dialer-app.qml	2016-01-18 15:13:38 +0000
@@ -325,26 +325,25 @@
     function call(number, skipDefaultSimDialog) {
         // clear the values here so that the changed signals are fired when the new value is set
         pendingNumberToDial = "";
-
         if (number === "") {
-            return
+            return false
         }
 
         if (isEmergencyNumber(number)) {
             callEmergency(number);
-            return;
+            return false
         }
 
         if (telepathyHelper.flightMode) {
             PopupUtils.open(Qt.createComponent("Dialogs/DisableFlightModeDialog.qml").createObject(mainView), mainView, {})
-            return
+            return false
         }
 
         // check if at least one account is selected
         if (multiplePhoneAccounts && !mainView.account) {
             Qt.inputMethod.hide()
             showNotification(i18n.tr("No SIM card selected"), i18n.tr("You need to select a SIM card"));
-            return
+            return false
         }
 
         if (multiplePhoneAccounts && !telepathyHelper.defaultCallAccount && !dualSimSettings.dialPadDontAsk && !skipDefaultSimDialog) {
@@ -352,46 +351,47 @@
             properties["phoneNumber"] = number
             properties["accountId"] = mainView.account.accountId
             PopupUtils.open(Qt.createComponent("Dialogs/SetDefaultSIMCardDialog.qml").createObject(mainView), mainView, properties)
-            return
+            return false
         }
 
         if (mainView.account && !mainView.greeterMode && mainView.account.simLocked) {
             var properties = {}
             properties["accountId"] = mainView.account.accountId
             PopupUtils.open(Qt.createComponent("Dialogs/SimLockedDialog.qml").createObject(mainView), mainView, properties)
-            return
+            return false
         }
 
         // avoid cleaning the keypadEntry in case there is no signal
         if (!mainView.account) {
             showNotification(i18n.tr("No network"), i18n.tr("There is currently no network."))
-            return
+            return false
         }
 
         if (!mainView.account.connected) {
             showNotification(i18n.tr("No network"),
                              telepathyHelper.accountIds.length >= 2 ? i18n.tr("There is currently no network on %1").arg(mainView.account.displayName)
                                                                     : i18n.tr("There is currently no network."))
-            return
+            return false
         }
 
         if (checkUSSD(number)) {
             PopupUtils.open(ussdProgressDialog)
             account.ussdManager.initiate(number)
-            return
+            return true
         }
 
         animateLiveCall();
 
         if (!accountReady) {
             pendingNumberToDial = number;
-            return;
+            return false
         }
 
         if (account && account.connected) {
             generalSettings.lastCalledPhoneNumber = number
             callManager.startCall(number, account.accountId);
         }
+        return true
     }
 
     function populateDialpad(number, accountId) {