[Merge] lp:~phablet-team/messaging-app/rename-chat-strings into lp:messaging-app/staging

[Gustavo Pichorim Boiko]

Review: Needs Fixing

Just one remark.

Diff comments:

> 
> === modified file 'src/qml/Messages.qml'
> --- src/qml/Messages.qml	2017-03-08 22:01:59 +0000
> +++ src/qml/Messages.qml	2017-03-08 22:01:59 +0000
> @@ -948,16 +952,23 @@
>              }
>              actionList.actions = []
>  
> -            actionList.addAction(mmsGroupAction)
> -
> -            for (var i in telepathyHelper.textAccounts.active) {
> +            if (telepathyHelper.phoneAccounts.active.length > 0) {
> +                actionList.addAction(mmsGroupAction)
> +            }
> +            if (!account || account.type == AccountEntry.PhoneAccount) {
> +                return
> +            }
> +            var action = customGroupChatActionComponent.createObject(actionList, {"account": account, "participants": multiRecipient.participants})
> +            actionList.addAction(action)
> + 
> +            /*for (var i in telepathyHelper.textAccounts.active) {

This block of commented out code, is it still necessary? if not, can you please remove it?

>                  var account = telepathyHelper.textAccounts.active[i]
>                  if (account.type == AccountEntry.PhoneAccount) {
>                      continue
>                  }
>                  var action = customGroupChatActionComponent.createObject(actionList, {"account": account, "participants": multiRecipient.participants})
>                  actionList.addAction(action)
> -            }
> +            }*/
>          }
>      }
>  


-- 
https://code.launchpad.net/~phablet-team/messaging-app/rename-chat-strings/+merge/314741
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/messaging-app/add_rejoin_chat_button.