messaging-app

Merge lp:~phablet-team/messaging-app/end-group-info-event into lp:messaging-app

  1. end-group-info-event
  2. Merge into trunk
Proposed by Roberto Mier Escandon
Status: Superseded
Proposed branch: lp:~phablet-team/messaging-app/end-group-info-event
Merge into: lp:messaging-app
Prerequisite: lp:~phablet-team/messaging-app/info-events-using-sender
Diff against target: 37 lines (+4/-2)
3 files modified
src/qml/AccountSectionDelegate.qml (+2/-0)
src/qml/GroupChatInfoPage.qml (+1/-1)
src/qml/Messages.qml (+1/-1)
To merge this branch: bzr merge lp:~phablet-team/messaging-app/end-group-info-event
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+306153@code.launchpad.net

This proposal has been superseded by a proposal from 2016-10-13.

Commit message

Added InformationTypeGroupGone option to draw message when group is dissolved.
Updated text for group dissolve message and for message in textbox when group does not exist anymore

Description of the change

Added InformationTypeGroupGone option to draw message when group is dissolved.
Updated text for group dissolve message and for message in textbox when group does not exist anymore

To post a comment you must log in.
Revision history for this message
Roberto Mier Escandon (rmescandon) wrote :

Added InformationTypeGroupGone option to draw message when group is dissolved.
Updated text for group dissolve message and for message in textbox when group does not exist anymore

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:621
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/107/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1564/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1564
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1412/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1412/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1412/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1412/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1412/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1412/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1412/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1412/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1412/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/107/rebuild

review: Needs Fixing (continuous-integration)
lp:~phablet-team/messaging-app/end-group-info-event updated
622. By Tiago Salem Herrmann

merge parent branch

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:622
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/108/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1578/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1578
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1427/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1427/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1427/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1427/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1427/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1427/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1427/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1427/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1427/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/108/rebuild

review: Needs Fixing (continuous-integration)
lp:~phablet-team/messaging-app/end-group-info-event updated
623. By Tiago Salem Herrmann

merge parent branch

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:623
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/121/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1681/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1681
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1527/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1527/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1527/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1527/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1527/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1527/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1527/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1527/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1527/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/121/rebuild

review: Needs Fixing (continuous-integration)
lp:~phablet-team/messaging-app/end-group-info-event updated
624. By Tiago Salem Herrmann

merge parent branch

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:624
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/128/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1707/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1707
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1552/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1552/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1552/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1552/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1552/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1552/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1552/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1552/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1552/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/128/rebuild

review: Needs Fixing (continuous-integration)
lp:~phablet-team/messaging-app/end-group-info-event updated
625. By Tiago Salem Herrmann

merge parent branch

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:625
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/136/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1791/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1791
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1636/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1636/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1636/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1636/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1636/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1636/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1636/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1636/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1636/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-app-ci/136/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/AccountSectionDelegate.qml'
2--- src/qml/AccountSectionDelegate.qml 2016-10-06 22:38:51 +0000
3+++ src/qml/AccountSectionDelegate.qml 2016-10-06 22:38:51 +0000
4@@ -138,6 +138,8 @@
5 return i18n.tr("You are not Admin")
6 case HistoryThreadModel.InformationTypeSelfKicked:
7 return i18n.tr("You were removed from this group")
8+ case HistoryThreadModel.InformationTypeGroupGone:
9+ return i18n.tr("Group has been dissolved")
10 }
11 return ""
12 }
13
14=== modified file 'src/qml/GroupChatInfoPage.qml'
15--- src/qml/GroupChatInfoPage.qml 2016-10-06 22:38:51 +0000
16+++ src/qml/GroupChatInfoPage.qml 2016-10-06 22:38:51 +0000
17@@ -130,7 +130,7 @@
18 if (!result) {
19 application.showNotificationMessage(i18n.tr("Failed to delete group"), "dialog-error-symbolic")
20 } else {
21- application.showNotificationMessage(i18n.tr("Successfully removed group"), "tick")
22+ application.showNotificationMessage(i18n.tr("Group has been dissolved"), "tick")
23 mainView.emptyStack()
24 }
25 }
26
27=== modified file 'src/qml/Messages.qml'
28--- src/qml/Messages.qml 2016-10-06 22:38:51 +0000
29+++ src/qml/Messages.qml 2016-10-06 22:38:51 +0000
30@@ -1377,7 +1377,7 @@
31 verticalAlignment: Text.AlignVCenter
32 horizontalAlignment: Text.AlignHCenter
33 wrapMode: Text.WordWrap
34- text: i18n.tr("You can't send messages to this group because you are no longer a participant")
35+ text: i18n.tr("You can't send messages to this group because the group is no longer active")
36 }
37 }
38

Subscribers

People subscribed via source and target branches

to all changes: