From 7da8edfa44b55c8dc53cb1d7b10f038a6138ee46 Mon Sep 17 00:00:00 2001
From: Bernd Wachter <bernd.wachter@jollamobile.com>
Date: Tue, 23 Dec 2014 14:35:00 +0200
Subject: [PATCH] Drop old workaround required for device migration

---
 libssu/ssucoreconfig.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/libssu/ssucoreconfig.cpp b/libssu/ssucoreconfig.cpp
index 5ed8542..a0437e5 100644
--- a/libssu/ssucoreconfig.cpp
+++ b/libssu/ssucoreconfig.cpp
@@ -63,17 +63,6 @@ int SsuCoreConfig::deviceMode(){
 
 QString SsuCoreConfig::domain(bool pretty){
   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