From 9aff13ef2a00fd4fec4756aafac7a033298035b3 Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Thu, 7 Dec 2017 13:37:57 +0100
Subject: update production

---
 .../main/java/de/blinkt/openvpn/VpnProfile.java    |  2 +-
 app/src/main/res/values/colors.xml                 | 22 ++++++++++++++++++++--
 .../java/se/leap/bitmaskclient/ProviderAPI.java    |  8 ++++----
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/de/blinkt/openvpn/VpnProfile.java b/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
index cc8d987c..aa25da48 100644
--- a/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
+++ b/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
@@ -1017,7 +1017,7 @@ public class VpnProfile implements Serializable, Cloneable {
 
         if (data.contains("Proc-Type: 4,ENCRYPTED"))
             return true;
-        else if (data.contains("-----BEGIN ENCRYPTED PRIVATE PROVIDER_KEY-----"))
+        else if (data.contains("-----BEGIN ENCRYPTED PRIVATE KEY-----"))
             return true;
         else
             return false;
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9f5d8813..1818312e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#8080b0</color>
-    <color name="colorPrimaryDark">#555575</color>
+    <color name="colorPrimary">#b39ddb</color>
+    <color name="colorPrimaryDark">#ac97d2</color>
+
+    <color name="red200">#ef9a9a</color>
+    <color name="pink200">#f48fb1</color>
+    <color name="purple200">#ce93d8</color>
+    <color name="deepPurple200">#b39ddb</color>
+    <color name="indigo200">#9fa8da</color>
+    <color name="blue200">#90caf9</color>
+    <color name="lightBlue200">#81d4fa</color>
+    <color name="cyan200">#80deea</color>
+    <color name="teal200">#80cbc4</color>
+    <color name="green200">#a5d6a7</color>
+    <color name="lightGreen200">#c5e1a5</color>
+    <color name="lime200">#e6ee9c</color>
+    <color name="yellow200">#fff59d</color>
+    <color name="amber200">#ffe082</color>
+    <color name="orange200">#ffcc80</color>
+    <color name="deepOrange200">#ffab91</color>
+
 </resources>
diff --git a/app/src/production/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/production/java/se/leap/bitmaskclient/ProviderAPI.java
index 9ab90cc2..fadb03c3 100644
--- a/app/src/production/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/production/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -119,8 +119,8 @@ public class ProviderAPI extends ProviderApiBase {
                 //TODO setProviderName(name);
 
                 preferences.edit().putString(Provider.KEY, provider_json.toString()).commit();
-                preferences.edit().putBoolean(Constants.ALLOWED_ANON, provider_json.getJSONObject(Provider.SERVICE).getBoolean(Constants.ALLOWED_ANON)).commit();
-                preferences.edit().putBoolean(Constants.ALLOWED_REGISTERED, provider_json.getJSONObject(Provider.SERVICE).getBoolean(Constants.ALLOWED_REGISTERED)).commit();
+                preferences.edit().putBoolean(Constants.PROVIDER_ALLOW_ANONYMOUS, provider_json.getJSONObject(Provider.SERVICE).getBoolean(Constants.PROVIDER_ALLOW_ANONYMOUS)).commit();
+                preferences.edit().putBoolean(Constants.PROVIDER_ALLOWED_REGISTERED, provider_json.getJSONObject(Provider.SERVICE).getBoolean(Constants.PROVIDER_ALLOWED_REGISTERED)).commit();
 
                 result.putBoolean(RESULT_KEY, true);
             } catch (JSONException e) {
@@ -149,7 +149,7 @@ public class ProviderAPI extends ProviderApiBase {
                 JSONObject eip_service_json = new JSONObject(eip_service_json_string);
                 eip_service_json.getInt(Provider.API_RETURN_SERIAL);
 
-                preferences.edit().putString(Constants.KEY, eip_service_json.toString()).commit();
+                preferences.edit().putString(Constants.PROVIDER_KEY, eip_service_json.toString()).commit();
 
                 result.putBoolean(RESULT_KEY, true);
             } catch (NullPointerException | JSONException e) {
@@ -172,7 +172,7 @@ public class ProviderAPI extends ProviderApiBase {
             JSONObject provider_json = new JSONObject(preferences.getString(Provider.KEY, ""));
 
             String provider_main_url = provider_json.getString(Provider.API_URL);
-            URL new_cert_string_url = new URL(provider_main_url + "/" + provider_json.getString(Provider.API_VERSION) + "/" + Constants.VPN_CERTIFICATE);
+            URL new_cert_string_url = new URL(provider_main_url + "/" + provider_json.getString(Provider.API_VERSION) + "/" + Constants.PROVIDER_VPN_CERTIFICATE);
 
             String cert_string = downloadWithProviderCA(new_cert_string_url.toString());
 
-- 
cgit v1.2.3