summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorFup Duck <fupduck@sacknagel.com>2017-12-07 13:37:57 +0100
committerFup Duck <fupduck@sacknagel.com>2017-12-07 13:37:57 +0100
commit9aff13ef2a00fd4fec4756aafac7a033298035b3 (patch)
treeab8ae2d074d04faaa6c23081a8c229b92b6068b3 /app/src/main
parentf8c2f76971f5a7f26d18e5e669d5e0ce9c560f3f (diff)
update production
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/de/blinkt/openvpn/VpnProfile.java2
-rw-r--r--app/src/main/res/values/colors.xml22
2 files changed, 21 insertions, 3 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>