diff options
5 files changed, 8 insertions, 6 deletions
diff --git a/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadNotificationManager.java b/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadNotificationManager.java index aaf487aa..939ed852 100644 --- a/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadNotificationManager.java +++ b/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadNotificationManager.java @@ -111,6 +111,7 @@ public class DownloadNotificationManager { NotificationManager.IMPORTANCE_LOW); channel.setSound(null, null); channel.setDescription(description); + channel.setLightColor(Color.BLUE); // Register the channel with the system; you can't change the importance // or other notification behaviors after this notificationManager.createNotificationChannel(channel); diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VpnNotificationManager.java b/app/src/main/java/se/leap/bitmaskclient/eip/VpnNotificationManager.java index 667b8892..d2603533 100644 --- a/app/src/main/java/se/leap/bitmaskclient/eip/VpnNotificationManager.java +++ b/app/src/main/java/se/leap/bitmaskclient/eip/VpnNotificationManager.java @@ -238,7 +238,6 @@ public class VpnNotificationManager { channel.setDescription(context.getString(R.string.channel_description_status)); channel.enableLights(true); - channel.setLightColor(Color.BLUE); channel.setSound(null, null); compatNotificationManager.createNotificationChannel(channel); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dd33ce33..6251949a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -88,7 +88,7 @@ <string name="action_example">Example action</string> <string name="action_settings">Settings</string> <string name="void_vpn_establish">%s blocks all outgoing internet traffic.</string> - <string name="void_vpn_error_establish">Failed to establish blocking VPN.</string> + <string name="void_vpn_error_establish">Blocking all internet traffic failed.</string> <string name="void_vpn_stopped">Stopped blocking all outgoing internet traffic.</string> <string name="void_vpn_title">Blocking traffic</string> <string name="update_provider_details">Update provider details</string> @@ -138,6 +138,8 @@ <string name="warning_no_more_gateways_use_pt">%s could not connect. It might be that VPN connections get blocked. Do you want to try to connect using obfuscated connections?</string> <string name="warning_no_more_gateways_no_pt">%s could not connect. Do you want to retry?</string> <string name="warning_no_more_gateways_use_ovpn">%s could not connect using obfuscated VPN connections. Do you want to try to connect using a standard VPN?</string> + <string name="warning_no_more_gateways_manual_gw_selection">%1$s could not connect to %2$s. Do you want to try to connect automatically with best location?</string> + <string name="warning_option_try_best">Try best location</string> <string name="warning_option_try_pt">Try obfuscated connection</string> <string name="warning_option_try_ovpn">Try standard connection</string> <string name="vpn_error_establish">Android failed to establish the VPN service.</string> diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml index 8c3c5944..2459e146 100644 --- a/app/src/main/res/values/untranslatable.xml +++ b/app/src/main/res/values/untranslatable.xml @@ -45,8 +45,6 @@ <string name="copyright_circleImageView" translatable="false">Copyright 2014 - 2020 Henning Dodenhof. Licensed under the Apache License, Version 2.0 </string> <!-- gateway selector, move to strings.xml, once the wording is clear --> - <string name="warning_no_more_gateways_manual_gw_selection" translatable="false">%1$s could not connect to %2$s. Do you want to try to connect automatically with best location?</string> - <string name="warning_option_try_best" translatable="false">Try best location</string> <string name="no_location" translatable="false">---</string> </resources>
\ No newline at end of file diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index 7d38973c..82d9155b 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -32,9 +32,11 @@ ENV ANDROID_NDK_HOME ${ANDROID_HOME}/android-ndk-${ANDROID_NDK_VERSION} ENV ANDROID_NDK_URL http://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux-x86_64.zip RUN curl -L $ANDROID_NDK_URL -o ndk.zip \ - && unzip ndk.zip -d $ANDROID_HOME \ + && unzip ndk.zip -d $ANDROID_HOME/ndk \ && rm -rf ndk.zip - +RUN cat $ANDROID_HOME/ndk/android-ndk-${ANDROID_NDK_VERSION}/source.properties | \ + grep Pkg.Revision | cut -d "=" -f 2 | \ + xargs -I '{}' mv $ANDROID_HOME/ndk/android-ndk-${ANDROID_NDK_VERSION}/ $ANDROID_HOME/ndk/'{}' ENV PATH ${PATH}:${ANDROID_NDK_HOME} RUN echo "accept all licenses" |