From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 24 Aug 2017 13:18:32 +0000 (+0200)
Subject: android: Hide app selection in profile editor on Android < 5
X-Git-Tag: 5.6.1dr2~10^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98ab757284779616423789a682eb2a00056fbf50;p=thirdparty%2Fstrongswan.git

android: Hide app selection in profile editor on Android < 5
---

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java
index 8bf5fd2b21..8792fd7e47 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java
@@ -22,6 +22,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.security.KeyChain;
 import android.security.KeyChainAliasCallback;
@@ -187,6 +188,13 @@ public class VpnProfileDetailActivity extends AppCompatActivity
 		mName.setAdapter(completeAdapter);
 		mRemoteId.setAdapter(completeAdapter);
 
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
+		{
+			findViewById(R.id.apps).setVisibility(View.GONE);
+			mSelectSelectedAppsHandling.setVisibility(View.GONE);
+			mSelectApps.setVisibility(View.GONE);
+		}
+
 		mGateway.addTextChangedListener(new TextWatcher() {
 			@Override
 			public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
diff --git a/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml b/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml
index 199a7dfeeb..f765dbcf19 100644
--- a/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml
+++ b/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml
@@ -341,6 +341,7 @@
                 android:text="@string/profile_split_tunnelingv6_title" />
 
             <TextView
+                android:id="@+id/apps"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"