← Back to branch summary

~xavi-garcia-mena/keeper/one-drive-provider

« back to all changes in this revision

Viewing changes to src/client/client.cpp

  • Committer: Xavi Garcia Mena
  • Date: 2016-12-22 12:19:13 UTC
  • Revision ID: xavi.garcia.mena@canonical.com-20161222121913-85l1lcgdnb9708ae
KeeperError as Error and error codes changed

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/client.cpp
69
69
        return ret;
70
70
    }
71
71
 
72
 
    static keeper::KeeperItemsMap getValue(QDBusMessage const & message, keeper::KeeperError & error)
 
72
    static keeper::KeeperItemsMap getValue(QDBusMessage const & message, keeper::Error & error)
73
73
    {
74
74
        if (message.errorMessage().isEmpty())
75
75
        {
76
76
            if (message.arguments().count() != 1)
77
77
            {
78
 
                error = keeper::KeeperError::ERROR_UNKNOWN;
 
78
                error = keeper::Error::UNKNOWN;
79
79
                return keeper::KeeperItemsMap();
80
80
            }
81
81
 
82
82
            auto value = message.arguments().at(0);
83
83
            if (value.typeName() != QStringLiteral("QDBusArgument"))
84
84
            {
85
 
                error = keeper::KeeperError::ERROR_UNKNOWN;
 
85
                error = keeper::Error::UNKNOWN;
86
86
                return keeper::KeeperItemsMap();
87
87
            }
88
88
            auto dbus_arg = value.value<QDBusArgument>();
89
 
            error = keeper::KeeperError::OK;
 
89
            error = keeper::Error::OK;
90
90
            keeper::KeeperItemsMap ret;
91
91
            dbus_arg >> ret;
92
92
            return ret;
93
93
        }
94
94
        if (message.arguments().count() != 2)
95
95
        {
96
 
            error = keeper::KeeperError::ERROR_UNKNOWN;
 
96
            error = keeper::Error::UNKNOWN;
97
97
            return keeper::KeeperItemsMap();
98
98
        }
99
99
 
102
102
        error = keeper::convert_from_dbus_variant(message.arguments().at(1), &valid);
103
103
        if (!valid)
104
104
        {
105
 
            error = keeper::KeeperError::ERROR_UNKNOWN;
 
105
            error = keeper::Error::UNKNOWN;
106
106
        }
107
107
        return keeper::KeeperItemsMap();
108
108
    }
126
126
 
127
127
    // Store backups list locally with an additional "enabled" pair to keep track enabled states
128
128
    // TODO: We should be listening to a backupChoicesChanged signal to keep this list updated
129
 
    keeper::KeeperError error;
 
129
    keeper::Error error;
130
130
    d->backups = getBackupChoices(error);
131
131
 
132
132
    for(auto iter = d->backups.begin(); iter != d->backups.end(); ++iter)
252
252
    return d->backups.value(uuid).value("display-name").toString();
253
253
}
254
254
 
255
 
keeper::KeeperItemsMap KeeperClient::getBackupChoices(keeper::KeeperError & error) const
 
255
keeper::KeeperItemsMap KeeperClient::getBackupChoices(keeper::Error & error) const
256
256
{
257
257
    QDBusMessage choices = d->userIface->call("GetBackupChoices");
258
258
    return KeeperClientPrivate::getValue(choices, error);
259
259
}
260
260
 
261
 
keeper::KeeperItemsMap KeeperClient::getRestoreChoices(keeper::KeeperError & error) const
 
261
keeper::KeeperItemsMap KeeperClient::getRestoreChoices(keeper::Error & error) const
262
262
{
263
263
    QDBusMessage choices = d->userIface->call("GetRestoreChoices");
264
264
    return KeeperClientPrivate::getValue(choices, error);