summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2015-10-25 20:17:54 +0100
committerArne Schwabe <arne@rfc2549.org>2015-10-25 22:31:48 +0100
commit4d6a12b09a2f0524820fb8f0a82eab625e401062 (patch)
tree9283416b1e10272fac0598d8fc927c108041f2ec /main
parentabc715ce6643f7db02eb93db64e33900a431165c (diff)
Fix config crash on < 4.4, Version 0.6.43v0.6.43
Diffstat (limited to 'main')
-rw-r--r--main/build.gradle4
m---------main/openvpn0
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java21
3 files changed, 13 insertions, 12 deletions
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
-Subproject daad4c998b57c07cd8b48007d13428d9f67e68a
+Subproject 62c7d5f90844609f05fe9d3d6c7cd82ea3233e9
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);
}
});