From: Muki Date: Sat, 19 May 2012 13:08:39 +0000 (+0200) Subject: Auth bug fix X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=cdf749f330f12e26393380d7300f57660697f6d3;p=ubi Auth bug fix --- diff --git a/qml/ubi/FilesPage.qml b/qml/ubi/FilesPage.qml index 8af530b..5a55fa8 100644 --- a/qml/ubi/FilesPage.qml +++ b/qml/ubi/FilesPage.qml @@ -55,6 +55,8 @@ Page { function onErr(status) { mask.state = "idle"; + initPage.hide(); + if(status==401) { tip.show(qsTr("Ubuntu One authorization has failed. Try once again or check login settings.")); } else if(status==0) { @@ -62,8 +64,14 @@ Page { } else { tip.show(qsTr("Unknown error: ")+status); } - pageStack.pop(); - initPage.hide() + + console.log("index="+pageStack.index); + + if(pageStack.index>0) { + pageStack.pop(); + } else { + pageStack.initialPage = "LoginPage.qml"; + } } diff --git a/qml/ubi/InitPage.qml b/qml/ubi/InitPage.qml index 3c9fdbc..7cec8a2 100644 --- a/qml/ubi/InitPage.qml +++ b/qml/ubi/InitPage.qml @@ -80,7 +80,7 @@ Showable { anchors.horizontalCenter: parent.horizontalCenter font.pixelSize: 20 color: "white" - text: "v0.9.3-1 © 2012 Michal Kosciesza" + text: "v0.9.3-2 © 2012 Michal Kosciesza" } Text { diff --git a/qml/ubi/LoginPage.qml b/qml/ubi/LoginPage.qml index d951800..4b55018 100644 --- a/qml/ubi/LoginPage.qml +++ b/qml/ubi/LoginPage.qml @@ -47,6 +47,7 @@ Page { id: content spacing: Const.DEFAULT_MARGIN x: Const.TEXT_MARGIN + width: root.width-2*Const.TEXT_MARGIN Spacer {} @@ -61,14 +62,16 @@ Page { TextField { id: user placeholderText: qsTr("User ID") - width: 400 + anchors.left: parent.left + anchors.right: parent.right } TextField { id: pass - width: 400 placeholderText: qsTr("Password") echoMode: TextInput.Password + anchors.left: parent.left + anchors.right: parent.right } Spacer {} @@ -76,6 +79,7 @@ Page { Button { label: qsTr("Save") onButtonClicked: root.getToken() + anchors.left: parent.left } } } diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog index 995f576..559b422 100644 --- a/qtc_packaging/debian_fremantle/changelog +++ b/qtc_packaging/debian_fremantle/changelog @@ -1,3 +1,9 @@ +ubi (0.9.3-2) unstable; urgency=low + + * Patch for authorization bug + + -- Michal Kosciesza Sat, 19 May 2012 14:40:25 +0200 + ubi (0.9.3-1) unstable; urgency=low * UTF-8 encoding support diff --git a/qtc_packaging/debian_fremantle/changelog~ b/qtc_packaging/debian_fremantle/changelog~ index fbc5105..995f576 100644 --- a/qtc_packaging/debian_fremantle/changelog~ +++ b/qtc_packaging/debian_fremantle/changelog~ @@ -2,7 +2,7 @@ ubi (0.9.3-1) unstable; urgency=low * UTF-8 encoding support * New icons - * New UI + * Updated GUI -- Michal Kosciesza Fri, 18 May 2012 22:10:09 +0200 diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog index 995f576..559b422 100644 --- a/qtc_packaging/debian_harmattan/changelog +++ b/qtc_packaging/debian_harmattan/changelog @@ -1,3 +1,9 @@ +ubi (0.9.3-2) unstable; urgency=low + + * Patch for authorization bug + + -- Michal Kosciesza Sat, 19 May 2012 14:40:25 +0200 + ubi (0.9.3-1) unstable; urgency=low * UTF-8 encoding support diff --git a/qtc_packaging/debian_harmattan/changelog~ b/qtc_packaging/debian_harmattan/changelog~ index fbc5105..995f576 100644 --- a/qtc_packaging/debian_harmattan/changelog~ +++ b/qtc_packaging/debian_harmattan/changelog~ @@ -2,7 +2,7 @@ ubi (0.9.3-1) unstable; urgency=low * UTF-8 encoding support * New icons - * New UI + * Updated GUI -- Michal Kosciesza Fri, 18 May 2012 22:10:09 +0200 diff --git a/ubi.pro.user b/ubi.pro.user index d9962f0..f4b57b1 100644 --- a/ubi.pro.user +++ b/ubi.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -444,6 +444,7 @@ /home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_0_2_armel.deb /home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_9_0-2_armel.deb /home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_9_1-1_armel.deb + /home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_9_3-2_armel.deb /home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_9_1-2_armel.deb /home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_9_2-1_armel.deb @@ -458,6 +459,7 @@ 192.168.2.101 192.168.2.101 192.168.2.101 + 192.168.2.101 @@ -470,6 +472,7 @@ + 2012-02-12T21:15:32 @@ -480,6 +483,7 @@ 2012-04-20T23:23:40 2012-04-28T10:41:48 2012-05-03T18:56:53 + 2012-05-19T14:49:00 2012-05-05T14:55:15 2012-05-18T21:37:42 @@ -1066,10 +1070,10 @@ 0 - 1 - 4_7_3 + 2 + 4_7_4 1 - symbian3 + symbianBelle 1 Build diff --git a/ubi.zip b/ubi.zip index b64fcad..d2fe6c5 100644 Binary files a/ubi.zip and b/ubi.zip differ diff --git a/www/index.html b/www/index.html index 72839e4..4dc682a 100644 --- a/www/index.html +++ b/www/index.html @@ -97,7 +97,7 @@ Contacts synchronization.

In Download section also an experimental release for Nokia N9/950 and Symbian was published. Please note that these apps have not been tested on real devices.

Download

-

The latest release is version 0.9.3-1

+

The latest release is version 0.9.3-2

Nokia N900

The application can be downloaded via the Application Manager under the Network section if you have the extras-devel repository enabled.

diff --git a/www/index.html~ b/www/index.html~ index 98c1bc3..72839e4 100644 --- a/www/index.html~ +++ b/www/index.html~ @@ -97,7 +97,7 @@ Contacts synchronization.

In Download section also an experimental release for Nokia N9/950 and Symbian was published. Please note that these apps have not been tested on real devices.

Download

-

The latest release is version 0.9.3-1

+

The latest release is version 0.9.3-1

Nokia N900

The application can be downloaded via the Application Manager under the Network section if you have the extras-devel repository enabled.