Merge pull request #6 from InvisibleManVPN/invisibleman

Invisible Man VPN version 1.7

Author: InvisibleManVPN

Invisible Man/Invisible Man.csproj

@@ -228,7 +228,9 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="packages.config" />
-    <None Include="Properties\app.manifest" />
+    <None Include="Properties\app.manifest">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

Invisible Man/InvisibleManCore.cs

@@ -29,11 +29,23 @@ public ServerInformation(string serverName, string countryImage, string serverAd
             this.password = password;
         }
     }
+    
+    class Message
+    {
+        public string content { get; set; }
+        public string link { get; set; }
+
+        public Message(string content, string link)
+        {
+            this.content = content;
+            this.link = link;
+        }
+    }
 
     class InvisibleManCore
     {
         // Initialize
-        public static int bundleIdentifier = 3;
+        public static int bundleIdentifier = 4;
         public static int index = 0;
         public static bool isSelectServer = false;
 
@@ -290,12 +302,13 @@ public async Task<string> CheckForUpdatesVPN()
         /// <summary>
         /// Check the server to message
         /// </summary>
-        public async Task<string> CheckForMessage()
+        public async Task<Message> CheckForMessage()
         {
             try
             {
                 ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12;
                 var url = "https://invisiblemanvpn.github.io/index.html";
+
                 HttpClient httpClient = new HttpClient();
                 string html = await httpClient.GetStringAsync(url);
 
@@ -306,16 +319,21 @@ public async Task<string> CheckForMessage()
                     .Equals("Message")).ToList();
                 HtmlAttribute contentHtmlAttribute = htmlNodeList[0].Attributes["content"];
 
-                string[] message = contentHtmlAttribute.Value.Split('|');
-                int messageTime = Convert.ToInt32(message[0]);
-                string messageContent = message[1];
+                string[] messageString = contentHtmlAttribute.Value.Split('|');
+                int messageTime = Convert.ToInt32(messageString[0]);
+                string messageContent = messageString[1];
+                string messageLink = null;
+                if (messageString.Length == 3)
+                    messageLink = messageString[2];
+
+                Message message = new Message(messageContent, messageLink);
 
                 await Task.Delay(messageTime * 1000);
-                return messageContent;
+                return message;
             }
             catch(Exception)
             {
-                return "FailedToConnect";
+                return new Message("FailedToConnect", null);
             }
         }
     }

Invisible Man/MainWindow.xaml

@@ -299,8 +299,10 @@
                         <ColumnDefinition Width="*"></ColumnDefinition>
                         <ColumnDefinition Width="35"></ColumnDefinition>
                     </Grid.ColumnDefinitions>
-
-                    <Label x:Name="LabelMessage" Grid.Column="0" Padding="0" HorizontalAlignment="Center" VerticalAlignment="Center" Content="Message content" FontFamily="{StaticResource SegoeUI}" FontWeight="Normal" FontSize="13" Foreground="Black"></Label>
+                    
+                    <Grid x:Name="GridMessageContent" Grid.Column="0" Background="{StaticResource BackgroundGrayLight}" PreviewMouseDown="GridMessageContent_PreviewMouseDown">
+                        <Label x:Name="LabelMessage" Grid.Column="0" Padding="0" HorizontalAlignment="Center" VerticalAlignment="Center" Content="Message content (Click here)" FontFamily="{StaticResource SegoeUI}" FontWeight="Normal" FontSize="13" Foreground="Black"></Label>
+                    </Grid>
                     <Viewbox x:Name="ButtonCloseMessage" Width="25" Height="25" HorizontalAlignment="Left" Grid.Column="1" Cursor="Hand" PreviewMouseDown="ButtonCloseMessage_PreviewMouseDown" >
                         <Canvas Width="24" Height="24" Background="{StaticResource BackgroundGrayLight}">
                             <Path Data="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" Fill="{StaticResource BackgroundRedDark}" />

Invisible Man/MainWindow.xaml.cs

@@ -40,6 +40,9 @@ public partial class MainWindow : Window
         // Notify icon
         private System.Windows.Forms.NotifyIcon notifyIcon = new System.Windows.Forms.NotifyIcon();
 
+        // Message link
+        private static string messageLink = null;
+
         public MainWindow()
         {
             InitializeComponent();
@@ -228,13 +231,17 @@ await Dispatcher.BeginInvoke(new Action(delegate
         private async void messageBackgroundWorker_DoWork(object sender, DoWorkEventArgs e)
         {
             InvisibleManCore invisibleManCore = new InvisibleManCore();
-            string message = await invisibleManCore.CheckForMessage();
+            Message message = await invisibleManCore.CheckForMessage();
 
             await Dispatcher.BeginInvoke(new Action(delegate
             {
-                if (message != "FailedToConnect")
+                if (message.content != "FailedToConnect")
                 {
-                    LabelMessage.Content = message;
+                    LabelMessage.Content = message.content;
+                    messageLink = message.link;
+                    if(!string.IsNullOrEmpty(messageLink))
+                        GridMessageContent.Cursor = Cursors.Hand;
+
                     GridMessage.Visibility = System.Windows.Visibility.Visible;
 
                     // Run the animation
@@ -567,5 +574,11 @@ private void ChangeServer()
                 // Do nothing!
             }
         }
+
+        private void GridMessageContent_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if(!string.IsNullOrEmpty(messageLink))
+                Process.Start(messageLink);
+        }
     }
 }

Invisible Man/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.7.0.0")]
+[assembly: AssemblyFileVersion("1.7.0.0")]