Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[ssu] Introduce rnd default domain, add workaround for keeping old rn…
…d domains intact on upgrade
  • Loading branch information
Bernd Wachter committed Nov 7, 2013
1 parent 37300dc commit 4f8d7f8
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
2 changes: 2 additions & 0 deletions libssu/ssu.cpp
Expand Up @@ -312,6 +312,8 @@ void Ssu::sendRegistration(QString usernameDomain, QString password){
} else {
// No domain defined
username = usernameDomain;
if (settings->contains("default-rnd-domain"))
setDomain(settings->value("default-rnd-domain").toString());
}

ssuCaCertificate = SsuRepoManager::caCertificatePath();
Expand Down
15 changes: 13 additions & 2 deletions libssu/ssucoreconfig.cpp
Expand Up @@ -58,12 +58,23 @@ int SsuCoreConfig::deviceMode(){
}

QString SsuCoreConfig::domain(bool pretty){
if (contains("domain"))
if (contains("domain")){
// this is a workaround for upgrading existing devices to
// Jolla sales setup. it should be removed in a few weeks
// this should keep devices with old default domain in rnd
// mode using the proper domain
if (contains("default-rnd-domain") &&
isRegistered() &&
value("domain").toString() == "sales" &&
(deviceMode() & Ssu::RndMode) == Ssu::RndMode)
setValue("domain", value("default-rnd-domain"));
//

if (pretty)
return value("domain").toString().replace(":", "-");
else
return value("domain").toString();
else
} else
return "";
}

Expand Down

0 comments on commit 4f8d7f8

Please sign in to comment.