← Back to branch summary

~phablet-team/telephony-service/staging

« back to all changes in this revision

Viewing changes to libtelephonyservice/greetercontacts.cpp

  • Committer: Gustavo Pichorim Boiko
  • Date: 2016-11-11 14:02:04 UTC
  • mfrom: (1232.1.1 mms_settings)
  • Revision ID: gustavo.boiko@canonical.com-20161111140204-ff3wjf3ofqvunwle
Replace the mms group option by mms enabled as groups are created in a different way now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libtelephonyservice/greetercontacts.cpp
1
1
/*
2
 
 * Copyright (C) 2013-2015 Canonical, Ltd.
 
2
 * Copyright (C) 2013-2016 Canonical, Ltd.
3
3
 *
4
4
 * Authors:
5
5
 *  Michael Terry <michael.terry@canonical.com>
 
6
 *  Gustavo Pichorim Boiko <gustavo.boiko@canonical.com>
 
7
 *  Tiago Salem Herrmann <tiago.herrmann@canonical.com>
6
8
 *
7
9
 * This file is part of telephony-service.
8
10
 *
186
188
    return mDialpadSoundsEnabled.toBool();
187
189
}
188
190
 
189
 
bool GreeterContacts::mmsGroupChatEnabled()
 
191
bool GreeterContacts::mmsEnabled()
190
192
{
191
193
    QMutexLocker locker(&mMutex);
192
 
    if (!mMmsGroupChatEnabled.isValid()) {
193
 
        mMmsGroupChatEnabled = getUserValue("com.ubuntu.touch.AccountsService.Phone", "MmsGroupChatEnabled");
 
194
    if (!mMmsEnabled.isValid()) {
 
195
        mMmsEnabled = getUserValue("com.ubuntu.touch.AccountsService.Phone", "MmsEnabled");
194
196
    }
195
 
    return mMmsGroupChatEnabled.toBool();
 
197
    return mMmsEnabled.toBool();
196
198
}
197
199
 
198
200
QString GreeterContacts::defaultSimForCalls()
254
256
    }
255
257
}
256
258
 
257
 
void GreeterContacts::setMmsGroupChatEnabled(bool enabled)
 
259
void GreeterContacts::setMmsEnabled(bool enabled)
258
260
{
259
261
    QString uid = QString::number(getuid());
260
262
    QDBusInterface iface("org.freedesktop.Accounts",
261
263
                         "/org/freedesktop/Accounts/User" + uid,
262
264
                         "org.freedesktop.DBus.Properties",
263
265
                         QDBusConnection::AS_BUSNAME());
264
 
    iface.asyncCall("Set", "com.ubuntu.touch.AccountsService.Phone", "MmsGroupChatEnabled", QVariant::fromValue(QDBusVariant(enabled)));
 
266
    iface.asyncCall("Set", "com.ubuntu.touch.AccountsService.Phone", "MmsEnabled", QVariant::fromValue(QDBusVariant(enabled)));
265
267
}
266
268
 
267
269
void GreeterContacts::setDefaultSimForMessages(const QString &objPath)
353
355
               message.path() == mActiveUser) {
354
356
        checkUpdatedValue(changed, invalidated, "DefaultSimForCalls", mDefaultSimForCalls);
355
357
        checkUpdatedValue(changed, invalidated, "DefaultSimForMessages", mDefaultSimForMessages);
356
 
        checkUpdatedValue(changed, invalidated, "MmsGroupChatEnabled", mMmsGroupChatEnabled);
 
358
        checkUpdatedValue(changed, invalidated, "MmsEnabled", mMmsEnabled);
357
359
        checkUpdatedValue(changed, invalidated, "SimNames", mSimNames);
358
360
        Q_FOREACH(const QString &key, changed.keys()) {
359
361
            Q_EMIT phoneSettingsChanged(key);
436
438
        mIncomingCallVibrate = QVariant();
437
439
        mIncomingMessageVibrate = QVariant();
438
440
        mDialpadSoundsEnabled = QVariant();
439
 
        mMmsGroupChatEnabled = QVariant();
 
441
        mMmsEnabled = QVariant();
440
442
        mDefaultSimForCalls = QVariant();
441
443
        mDefaultSimForMessages = QVariant();
442
444
        mSimNames = QVariant();