← Back to branch summary

~phablet-team/messaging-framework/prepare_for_release

« back to all changes in this revision

Viewing changes to include/messaging/qt/tp/text_channel.h

- When cancelling group, do this:
1) remove self handle giving a reason
2) close channel

- Provided an enum of generic reasons for cancelling the group
- Removed not needed on_closed() callback in Chat object.

NOTE: This MRs should be landed along with https://code.launchpad.net/~ningbo-team/ningbo/set-reason-when-cancelling-group/+merge/302508.

Approved by Tiago Salem Herrmann, system-apps-ci-bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/messaging/qt/tp/text_channel.h
69
69
    /// definitive one
70
70
    void on_message_id_changed(const std::string& old_id, const std::string& new_id) override;
71
71
 
72
 
    /// @brief on_closed received when the chat is no longer valid
73
 
    void on_closed() override;
74
 
 
75
72
    /// @brief on_group_created when the group has been created ok in the server
76
73
    void on_group_created() override;
77
74
 
79
76
    void on_group_creation_rejected() override;
80
77
 
81
78
    /// @brief on_group_cancelled when the group is no longer valid
82
 
    void on_group_cancelled() override;
 
79
    void on_group_cancelled(CancelGroupReason reason) override;
83
80
 
84
81
    /// @brief on_group_quit when confirmed leaving a group
85
82
    void on_group_quit() override;
140
137
        /// definitive one
141
138
        void on_message_id_changed(const std::string& old_id, const std::string& new_id) override;
142
139
 
143
 
        /// @brief on_closed received when the chat is no longer valid and must be disposed.
144
 
        void on_closed() override;
145
 
 
146
140
        /// @brief on_group_created when the group has been created ok in the server
147
141
        void on_group_created() override;
148
142
 
150
144
        void on_group_creation_rejected() override;
151
145
 
152
146
        /// @brief on_group_cancelled when the group is no longer valid
153
 
        void on_group_cancelled() override;
 
147
        void on_group_cancelled(CancelGroupReason reason) override;
154
148
 
155
149
        /// @brief on_group_quit when confirmed leaving a group
156
150
        void on_group_quit() override;
198
192
 
199
193
    // channel destruction request. only supported in group chats
200
194
    void destroy(Tp::DBusError* error);
 
195
    // internal method to close the channel when requested from server side
 
196
    void close_channel_with_reason(uint reason, const QString &message);
201
197
 
202
198
    // Helper functions encapsulating setup tasks.
203
199
    void register_callbacks_once();