From bb65d4511af541df6728ffea1df96f66837e518e Mon Sep 17 00:00:00 2001
From: M66B <marcel@bokhorst.biz>
Date: Tue, 3 Jun 2014 19:05:06 +0200
Subject: [PATCH] Fixed selected accounts when imported from another device

Refs #1699
---
 CHANGELOG.md                                | 1 +
 res/layout/settings.xml                     | 2 ++
 src/biz/bokhorst/xprivacy/ActivityMain.java | 4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ec097c73..d3d6e69cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ Changelog
 * Show all usage data ([issue](/../../issues/1695))
 * Show toggle on demand restricting on/off always ([issue](/../../issues/1697))
 * Added option to merge template with existing restrictions ([issue](/../../issues/1700))
+* Fixed selected accounts when imported from another device ([issue](/../../issues/1699))
 * Updated Dutch translation
 * Updated German translation
 * Updated Lithuanian translation
diff --git a/res/layout/settings.xml b/res/layout/settings.xml
index cfd634714..39fdce1d3 100644
--- a/res/layout/settings.xml
+++ b/res/layout/settings.xml
@@ -87,6 +87,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="30dip"
+                android:background="?attr/color_dangerous"
                 android:text="@string/settings_syscomponents" />
 
             <CheckBox
@@ -94,6 +95,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="30dip"
+                android:background="?attr/color_dangerous"
                 android:text="@string/settings_dangerous" />
 
             <CheckBox
diff --git a/src/biz/bokhorst/xprivacy/ActivityMain.java b/src/biz/bokhorst/xprivacy/ActivityMain.java
index f865cf4e9..4de8d58a9 100644
--- a/src/biz/bokhorst/xprivacy/ActivityMain.java
+++ b/src/biz/bokhorst/xprivacy/ActivityMain.java
@@ -32,6 +32,7 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
@@ -169,8 +170,9 @@ protected void onCreate(Bundle savedInstanceState) {
 			Util.importProLicense(new File(getIntent().getData().getEncodedPath()));
 
 		// Delete legacy salt
+		String def = (Build.SERIAL == null ? "" : Build.SERIAL);
 		String salt = PrivacyManager.getSetting(userId, PrivacyManager.cSettingSalt, null, false);
-		if (salt != null && salt.equals(PrivacyManager.getSalt(userId)))
+		if (def.equals(salt))
 			PrivacyManager.setSetting(userId, PrivacyManager.cSettingSalt, null);
 
 		// Set layout