Minor fixes

Author: schwabe

main/src/main/java/de/blinkt/openvpn/VpnProfile.java

@@ -329,8 +329,8 @@ public void upgradeProfile() {
                 if (mAllowAppVpnBypass)
                     mBlockUnusedAddressFamilies = false;
             case 8:
-                if (!TextUtils.isEmpty(mCipher) && !mCipher.equals("AES-256-GCM") && !mCipher.equals("AES-128-GCM")) {
-                    mDataCiphers = "AES-256-GCM:AES-128-GCM:" + mCipher;
+                if (!TextUtils.isEmpty(mCipher) && !mCipher.equals("AES-256-GCM") && !mCipher.equals("AES-128-GCM") && !mCipher.equals("CHACHA20-POLY1305")) {
+                    mDataCiphers = "AES-256-GCM:AES-128-GCM:CHACHA20-POLY1305:" + mCipher;
                 }
             case 9:
                 if (!TextUtils.isEmpty(mDataCiphers) &&

main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java

@@ -717,7 +717,7 @@ public void onDestroy() {
         }
 
         if (mDeviceStateReceiver != null) {
-            this.unregisterReceiver(mDeviceStateReceiver);
+            unregisterDeviceStateReceiver();
         }
         // Just in case unregister for state
         VpnStatus.removeStateListener(this);

main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java

@@ -134,7 +134,7 @@ public static void flushLog() {
             mLogFileHandler.sendEmptyMessage(LogFileHandler.FLUSH_TO_DISK);
     }
 
-    public static void setConnectedVPNProfile(String uuid) {
+    public synchronized static void setConnectedVPNProfile(String uuid) {
         mLastConnectedVPNUUID = uuid;
         for (StateListener sl: stateListener)
             sl.setConnectedVPN(uuid);

main/src/main/res/values/strings.xml

@@ -126,7 +126,7 @@
     <string name="no_vpn_support_image">Your image does not support the VPNService API, sorry :(</string>
     <string name="encryption">Encryption</string>
     <string name="cipher_dialog_title">Enter data encryption methods</string>
-    <string name="chipher_dialog_message">Enter the data encryption cipher algorithms used by OpenVPN separated by : (--data-ciphers). Leave empty to use the default of AES-256-GCM:AES-128-GCM.</string>
+    <string name="chipher_dialog_message">Enter the data encryption cipher algorithms used by OpenVPN separated by : (--data-ciphers). Leave empty to use the default of AES-256-GCM:AES-128-GCM:CHACHA20-POLY1305.</string>
     <string name="auth_dialog_message">Enter the authentication digest used for OpenVPN. Leave empty to use default digest.</string>
     <string name="settings_auth">Authentication/Encryption</string>
     <string name="file_explorer_tab">File Explorer</string>