Merge pull request #405 from eduvpn/feature/dependency_updates

Bugfixes
eduvpn · Nov 1, 2023 · 751826d · 751826d
2 parents 8d46462 + 6be533b
commit 751826d
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 23 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -29,6 +29,7 @@ android {
                         "\"RWQKqtqvd0R7rUDp0rWzbtYPA3towPWcLDCl7eY9pBMMI/ohCmrS0WiM\"" + // RoSp
                         "}"
         buildConfigField "boolean", "API_DISCOVERY_ENABLED", "true" // If false, you can only enter server URLs manually.
+        buildConfigField "String", "HELP_URI", "\"https://www.eduvpn.org/faq.html\""
 
         // API
         buildConfigField "String", "OAUTH_CLIENT_ID", "\"org.eduvpn.app.android\""
@@ -95,6 +96,7 @@ android {
             buildConfigField "boolean", "API_DISCOVERY_ENABLED", "false"
             buildConfigField "String", "OAUTH_CLIENT_ID", "\"org.govvpn.app.android\""
             buildConfigField "String", "OAUTH_REDIRECT_URI", "\"org.govvpn.app:/api/callback\""
+            buildConfigField "String", "HELP_URI", "\"https://govroam.nl/govvpn\""
 
             manifestPlaceholders = [
                     'redirectScheme': 'org.govvpn.app.android'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 
     <application
         android:name=".EduVPNApplication"

diff --git a/app/src/main/java/nl/eduvpn/app/Constants.kt b/app/src/main/java/nl/eduvpn/app/Constants.kt
@@ -27,9 +27,6 @@ object Constants {
     @JvmField
     val DEBUG = BuildConfig.BUILD_TYPE.equals("debug", ignoreCase = true)
 
-    @JvmField
-    val HELP_URI = Uri.parse("https://www.eduvpn.org/faq.html")
-
     @JvmField
     val LOCALE = Locale.getDefault()
     val ENGLISH_LOCALE = Locale.ENGLISH

diff --git a/app/src/main/java/nl/eduvpn/app/LicenseActivity.kt b/app/src/main/java/nl/eduvpn/app/LicenseActivity.kt
@@ -34,7 +34,7 @@ class LicenseActivity : BaseActivity<ActivityLicensesBinding>() {
         binding.webView.loadUrl("file:///android_asset/licenses.html");
         binding.toolbar.settingsButton.isVisible = false
         binding.toolbar.helpButton.setOnClickListener {
-            startActivity(Intent(Intent.ACTION_VIEW, Constants.HELP_URI))
+            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(BuildConfig.HELP_URI)))
         }
     }
 

diff --git a/app/src/main/java/nl/eduvpn/app/MainActivity.kt b/app/src/main/java/nl/eduvpn/app/MainActivity.kt
@@ -152,13 +152,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         }
         _parseIntentOnStart = true
         binding.toolbar.settingsButton.setOnClickListener { _: View? -> onSettingsButtonClicked() }
-        binding.toolbar.helpButton.setOnClickListener { _: View? ->
-            startActivity(
-                Intent(
-                    Intent.ACTION_VIEW,
-                    Constants.HELP_URI
-                )
-            )
+        binding.toolbar.helpButton.setOnClickListener {
+            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(BuildConfig.HELP_URI)))
         }
         createCertExpiryNotificationChannel()
         createVPNConnectionNotificationChannel()

diff --git a/app/src/main/java/nl/eduvpn/app/SettingsActivity.kt b/app/src/main/java/nl/eduvpn/app/SettingsActivity.kt
@@ -18,6 +18,7 @@ package nl.eduvpn.app
 
 import android.content.Intent
 import android.content.res.ColorStateList
+import android.net.Uri
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
@@ -43,7 +44,7 @@ class SettingsActivity : BaseActivity<ActivitySettingsBinding>() {
         binding.toolbar.settingsButton.imageTintList =
             ColorStateList.valueOf(ContextCompat.getColor(this, R.color.buttonBackgroundColor))
         binding.toolbar.helpButton.setOnClickListener { _: View ->
-            startActivity(Intent(Intent.ACTION_VIEW, Constants.HELP_URI))
+            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(BuildConfig.HELP_URI)))
         }
     }
 

diff --git a/app/src/main/java/nl/eduvpn/app/fragment/ConnectionStatusFragment.kt b/app/src/main/java/nl/eduvpn/app/fragment/ConnectionStatusFragment.kt
@@ -94,6 +94,7 @@ class ConnectionStatusFragment : BaseFragment<FragmentConnectionStatusBinding>()
                 bc?.bytesOut
             )
         }.asLiveData()
+        binding.protocol = vpnService.getProtocol()
         binding.ips = viewModel.ipFLow.asLiveData()
         binding.connectionSwitch.setOnCheckedChangeListener { _, isChecked ->
             if (isAutomaticCheckChange) {

diff --git a/app/src/main/java/nl/eduvpn/app/service/EduVPNOpenVPNService.java b/app/src/main/java/nl/eduvpn/app/service/EduVPNOpenVPNService.java
@@ -32,6 +32,7 @@
 import androidx.lifecycle.FlowLiveDataConversions;
 import androidx.lifecycle.LiveData;
 
+import org.eduvpn.common.Protocol;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -316,8 +317,9 @@ public void updateState(String state, String logmessage, int localizedResId, Con
         });
     }
 
-    @NotNull
-    public String getProtocolName() {
-        return "OpenVPN";
+    @NonNull
+    @Override
+    public Protocol getProtocol() {
+        return Protocol.OpenVPN;
     }
 }
diff --git a/app/src/main/java/nl/eduvpn/app/service/VPNService.kt b/app/src/main/java/nl/eduvpn/app/service/VPNService.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.LiveData
 import kotlinx.coroutines.flow.Flow
 import nl.eduvpn.app.livedata.ByteCount
 import nl.eduvpn.app.livedata.IPs
+import org.eduvpn.common.Protocol
 
 abstract class VPNService : LiveData<VPNService.VPNStatus>() {
 
@@ -44,7 +45,7 @@ abstract class VPNService : LiveData<VPNService.VPNStatus>() {
     abstract fun getStatus(): VPNStatus
 
     /**
-     * Name of the VPN protocol.
+     * Type of the VPN protocol this service implements.
      */
-    abstract fun getProtocolName(): String
+    abstract fun getProtocol(): Protocol
 }
diff --git a/app/src/main/java/nl/eduvpn/app/service/WireGuardService.kt b/app/src/main/java/nl/eduvpn/app/service/WireGuardService.kt
@@ -22,6 +22,7 @@ import nl.eduvpn.app.livedata.IPs
 import nl.eduvpn.app.livedata.TunnelData
 import nl.eduvpn.app.utils.Log
 import nl.eduvpn.app.utils.WireGuardTunnel
+import org.eduvpn.common.Protocol
 import java.net.Inet4Address
 import java.util.concurrent.Executors
 import kotlin.coroutines.resume
@@ -158,8 +159,8 @@ class WireGuardService(private val context: Context, timer: Flow<Unit>): VPNServ
         }
     }
 
-    override fun getProtocolName(): String {
-        return "WireGuard"
+    override fun getProtocol(): Protocol {
+        return Protocol.WireGuard
     }
 
     companion object {

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -17,6 +17,8 @@
 
         <include
             android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
             layout="@layout/include_toolbar"/>
 
     </RelativeLayout>

diff --git a/app/src/main/res/layout/fragment_connection_status.xml b/app/src/main/res/layout/fragment_connection_status.xml
@@ -7,6 +7,7 @@
 
         <import type="androidx.lifecycle.LiveData" />
         <import type="nl.eduvpn.app.livedata.IPs" />
+        <import type="org.eduvpn.common.Protocol" />
 
         <variable
             name="viewModel"
@@ -28,6 +29,11 @@
             name="ips"
             type="LiveData&lt;IPs>" />
 
+        <variable
+            name="protocol"
+            type="org.eduvpn.common.Protocol"
+            />
+
         <import type="android.view.View" />
     </data>
 
@@ -344,12 +350,32 @@
                     app:layout_constraintTop_toBottomOf="@id/label_ipv6"
                     tools:text="2001:610:450:40::2:100b" />
 
+                <TextView
+                    android:id="@+id/label_protocol"
+                    style="@style/ConnectionInfoLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/connection_info_protocol"
+                    app:layout_constraintLeft_toLeftOf="@id/guide_vertical_divide"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintWidth_percent="0.5" />
+
+                <TextView
+                    android:id="@+id/value_protocol"
+                    style="@style/ConnectionInfoValue"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{protocol == Protocol.OpenVPN ? @string/connection_info_protocol_name_openvpn : @string/connection_info_protocol_name_wireguard}"
+                    app:layout_constraintLeft_toLeftOf="@id/value_uploaded"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="WireGuard" />
+
                 <androidx.constraintlayout.widget.Guideline
                     android:id="@+id/guide_vertical_divide"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    app:layout_constraintGuide_percent="0.55" />
+                    app:layout_constraintGuide_percent="0.52" />
 
 
             </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/app/src/main/res/layout/include_toolbar.xml b/app/src/main/res/layout/include_toolbar.xml
@@ -56,7 +56,7 @@
                 android:contentDescription="@string/content_description_settings_button"
                 android:padding="8dp"
                 android:src="@drawable/ic_settings"
-                android:tint="@color/iconColor"
+                app:tint="@color/iconColor"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -68,7 +68,7 @@
                 android:contentDescription="@string/content_description_settings_button"
                 android:padding="8dp"
                 android:src="@drawable/ic_help"
-                android:tint="@color/iconColor"
+                app:tint="@color/iconColor"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintRight_toRightOf="parent" />
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -31,6 +31,9 @@
     <string name="connection_info_uploaded">UPLOADED</string>
     <string name="connection_info_ipv4">IPv4 ADDRESS</string>
     <string name="connection_info_ipv6">IPv6 ADDRESS</string>
+    <string name="connection_info_protocol">PROTOCOL</string>
+    <string name="connection_info_protocol_name_wireguard">WireGuard</string>
+    <string name="connection_info_protocol_name_openvpn">OpenVPN</string>
 
     <string name="connection_info_state_connecting">Connecting</string>
     <string name="connection_info_state_connected">Connected</string>

diff --git a/common/libs/eduvpn-common b/common/libs/eduvpn-common
+3 −8		go.mod
+6 −12		go.sum
+1 −1		internal/oauth/oauth.go
+3 −1		internal/server/custom/custom.go
+4 −0		internal/server/institute/institute.go
+4 −0		internal/server/secure/secure.go