From 210ed74b36c6558a965c03b8df84198fa2cef6a6 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 10 Aug 2015 13:52:25 +0200
Subject: Fix stupid bug with crl-verify, finally fix fd protect message log
 level

---
 main/openvpn                                                      | 2 +-
 .../main/java/de/blinkt/openvpn/activities/ConfigConverter.java   | 2 +-
 .../java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java   | 7 ++++---
 .../main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java | 8 ++++----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/main/openvpn b/main/openvpn
index 0a099916..601da8f5 160000
--- a/main/openvpn
+++ b/main/openvpn
@@ -1 +1 @@
-Subproject commit 0a099916c3c7148146761595c14ab643b7250034
+Subproject commit 601da8f5c2cb21d46c5e35694651294794c1a6c0
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java b/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java
index e50250cf..a6b97bb5 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java
+++ b/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java
@@ -188,7 +188,7 @@ public class ConfigConverter extends Activity implements FileSelectCallback, Vie
 
         // Only use crl on import if it is found
         ConfigParser.removeCRLCustomOption(mResult);
-        if (TextUtils.isEmpty(mCrlFileName)) {
+        if (!TextUtils.isEmpty(mCrlFileName)) {
             // TODO: Convert this to a real config option that is parsed
             mResult.mCustomConfigOptions += "\ncrl-verify " + mCrlFileName;
         }
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java
index 68f6a4d9..ded7b8ad 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java
@@ -32,6 +32,7 @@ import android.widget.TextView;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.Vector;
 
 import de.blinkt.openvpn.R;
@@ -119,7 +120,7 @@ public class Settings_Allowed_Apps extends Fragment implements AdapterView.OnIte
             @Override
             protected FilterResults performFiltering(CharSequence constraint) {
 
-                String filterString = constraint.toString().toLowerCase();
+                String filterString = constraint.toString().toLowerCase(Locale.getDefault());
 
                 FilterResults results = new FilterResults();
 
@@ -135,10 +136,10 @@ public class Settings_Allowed_Apps extends Fragment implements AdapterView.OnIte
                         appName = pInfo.packageName;
 
                     if (appName instanceof  String) {
-                        if (((String) appName).toLowerCase().contains(filterString))
+                        if (((String) appName).toLowerCase(Locale.getDefault()).contains(filterString))
                                 nlist.add(pInfo);
                     } else {
-                        if (appName.toString().toLowerCase().contains(filterString))
+                        if (appName.toString().toLowerCase(Locale.getDefault()).contains(filterString))
                             nlist.add(pInfo);
                     }
                 }
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
index 037ab457..271453b6 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
@@ -49,13 +49,13 @@ public class ShowConfigFragment extends Fragment {
 		
 		new Thread() {
 			public void run() {
-				final String cfg=vp.getConfigFile(getActivity(),false);
-				configtext= cfg;
+				/* Add a few newlines to make the textview scrollable past the FAB */
+				final String cfg=vp.getConfigFile(getActivity(),false) + "\n\n\n";
 				getActivity().runOnUiThread(new Runnable() {
 					
 					@Override
 					public void run() {
-						cv.setText(cfg);		
+						cv.setText(cfg);
 					}
 				});
 				
@@ -114,4 +114,4 @@ public class ShowConfigFragment extends Fragment {
             startGenConfig(vp, mConfigView);
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3