From 4d6a12b09a2f0524820fb8f0a82eab625e401062 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 25 Oct 2015 20:17:54 +0100
Subject: Fix config crash on < 4.4, Version 0.6.43

---
 main/build.gradle                                   |  4 ++--
 main/openvpn                                        |  2 +-
 .../openvpn/fragments/ShowConfigFragment.java       | 21 +++++++++++----------
 3 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'main')

diff --git a/main/build.gradle b/main/build.gradle
index 7bbd856b..8e9caf35 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -20,8 +20,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode = 122
-        versionName = "0.6.42"
+        versionCode = 123
+        versionName = "0.6.43"
     }
 
     sourceSets {
diff --git a/main/openvpn b/main/openvpn
index daad4c99..62c7d5f9 160000
--- a/main/openvpn
+++ b/main/openvpn
@@ -1 +1 @@
-Subproject commit daad4c998b57c07cd8b48007d13428d9f67e68a7
+Subproject commit 62c7d5f90844609f05fe9d3d6c7cd82ea3233e90
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 50df86c1..5a5a846f 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
@@ -34,15 +34,15 @@ public class ShowConfigFragment extends Fragment {
 		
 
 		mfabButton = (ImageButton) v.findViewById(R.id.share_config);
-        if (mfabButton!=null)
-            mfabButton.setOnClickListener( new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    shareConfig();
-                }
-            });
-		mfabButton.setVisibility(View.INVISIBLE);
-
+        if (mfabButton!=null) {
+			mfabButton.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					shareConfig();
+				}
+			});
+			mfabButton.setVisibility(View.INVISIBLE);
+		}
 		return v;
 	}
 
@@ -57,7 +57,8 @@ public class ShowConfigFragment extends Fragment {
 					@Override
 					public void run() {
 						cv.setText(configtext);
-						mfabButton.setVisibility(View.VISIBLE);
+                        if (mfabButton!=null)
+						    mfabButton.setVisibility(View.VISIBLE);
 					}
 				});
 				
-- 
cgit v1.2.3