From 0d5bd6321915c753dc569bad02f161f03c4c7ad4 Mon Sep 17 00:00:00 2001
From: HearSilent <hear.silent1995@gmail.com>
Date: Fri, 25 Sep 2015 14:10:03 +0800
Subject: [PATCH] Fix login bug (Windows), Fix logout bug (Android, Windows),
 Update version to 2.1.6.

---
 Android/app/build.gradle                      |  4 +--
 .../kuas/wifiautologin/libs/LoginHelper.java  |  3 +-
 Windows/KUAS WiFi/LoginFrm.vb                 | 29 +++++++++++++++----
 Windows/KUAS WiFi/My Project/AssemblyInfo.vb  |  4 +--
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/Android/app/build.gradle b/Android/app/build.gradle
index 3c43677..487471c 100644
--- a/Android/app/build.gradle
+++ b/Android/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "tw.edu.kuas.wifiautologin"
         minSdkVersion 9
         targetSdkVersion 22
-        versionCode 215
-        versionName "2.1.5"
+        versionCode 216
+        versionName "2.1.6"
     }
     buildTypes {
         debug {
diff --git a/Android/app/src/main/java/tw/edu/kuas/wifiautologin/libs/LoginHelper.java b/Android/app/src/main/java/tw/edu/kuas/wifiautologin/libs/LoginHelper.java
index a274519..0c1231f 100644
--- a/Android/app/src/main/java/tw/edu/kuas/wifiautologin/libs/LoginHelper.java
+++ b/Android/app/src/main/java/tw/edu/kuas/wifiautologin/libs/LoginHelper.java
@@ -417,7 +417,7 @@ private static void checkLogoutLocation(final Context context, final GeneralCall
 		if (!location.equals("")) {
 			if (location.contains("login_online")) {
 				logout(context, callback, Constant.JIANGONG_WIFI_SERVER);
-			} else if (location.contains("auth_entry")) {
+			} else if (location.contains("login.php")) {
 				tracker.send(
 						new HitBuilders.EventBuilder().setCategory("onFailure").setAction("Logout")
 								.setLabel("Already logged out").build());
@@ -498,6 +498,7 @@ private static void retryLogin(Context context, final LinkedHashMap<String, Stri
 			mNotificationManager.notify(Constant.NOTIFICATION_LOGIN_ID, mBuilder.build());
 		} else {
 			errorTimes = 0;
+			mNotificationManager.cancel(Constant.NOTIFICATION_LOGIN_ID);
 		}
 
 		errorTimes++;
diff --git a/Windows/KUAS WiFi/LoginFrm.vb b/Windows/KUAS WiFi/LoginFrm.vb
index 02d996a..00f5ec6 100644
--- a/Windows/KUAS WiFi/LoginFrm.vb	
+++ b/Windows/KUAS WiFi/LoginFrm.vb	
@@ -39,10 +39,15 @@ Public Class LoginFrm
         disableViews()
 
         Try
-            Dim response As HttpWebResponse = HttpWebResponseUtility.CreateGetHttpResponse("http://" + JIANGONG_WIFI_SERVER, 7000, Nothing, Nothing)
+            Dim response As HttpWebResponse = HttpWebResponseUtility.CreateGetHttpResponse("https://www.example.com/", 7000, Nothing, Nothing)
             Dim reader As StreamReader = New StreamReader(response.GetResponseStream, System.Text.Encoding.GetEncoding("UTF-8"))
             Dim respHTML As String = reader.ReadToEnd()
-            checkLoginLocation(response.Headers.[Get]("Location"))
+            If (response.StatusCode = 200) Then
+                MsgBox("您已經登入或是有可用網路了。", MsgBoxStyle.Information, "高應無線通")
+                enableViews()
+            Else
+                checkLoginLocation(response.Headers.[Get]("Location"))
+            End If
             response.Close()
         Catch ex As Exception
             MsgBox("請求 Wi-Fi 伺服器的連線逾時。", MsgBoxStyle.Critical, "高應無線通")
@@ -96,7 +101,7 @@ Public Class LoginFrm
             MsgBox("請求 Wi-Fi 伺服器的連線逾時。", MsgBoxStyle.Critical, "高應無線通")
             enableViews()
         Else
-            If (_location.Contains("auth_entry")) Then
+            If (_location.Contains("login.php")) Then
                 If match.Success Then
                     login(match.Value)
                 Else
@@ -104,9 +109,18 @@ Public Class LoginFrm
                     enableViews()
                 End If
             Else
-                If (_location.Contains("login_online") Or _location.Contains("login.php")) Then
+                If (_location.Contains("login_online")) Then
                     MsgBox("您已經登入或是有可用網路了。", MsgBoxStyle.Information, "高應無線通")
                     enableViews()
+                Else
+                    If (match.Success And match.Value.Equals(JIANGONG_WIFI_SERVER)) Then
+                        login(YANCHAO_WIFI_SERVER)
+                    ElseIf (match.Success And match.Value.Equals(YANCHAO_WIFI_SERVER)) Then
+                        login(JIANGONG_WIFI_SERVER)
+                    Else
+                        MsgBox("發生錯誤！", MsgBoxStyle.Critical, "高應無線通")
+                        enableViews()
+                    End If
                 End If
             End If
         End If
@@ -117,10 +131,11 @@ Public Class LoginFrm
             MsgBox("請求 Wi-Fi 伺服器的連線逾時。", MsgBoxStyle.Critical, "高應無線通")
             enableViews()
         Else
-            If (_location.Contains("login_online") Or _location.Contains("login.php")) Then
+            If (_location.Contains("login_online")) Then
                 logout(JIANGONG_WIFI_SERVER)
-            ElseIf (_location.Contains("auth_entry")) Then
+            ElseIf (_location.Contains("login.php")) Then
                 MsgBox("您已經登出或是尚未登入WiFi。", MsgBoxStyle.Critical, "高應無線通")
+                enableViews()
             Else
                 logout(YANCHAO_WIFI_SERVER)
             End If
@@ -282,6 +297,8 @@ Namespace SilentWebModule
         ''' <param name="cookies">隨同HTTP請求發送的Cookie信息，如果不需要身分驗證可以為空</param>
         ''' <returns></returns>
         Public Shared Function CreateGetHttpResponse(url As String, timeout As System.Nullable(Of Integer), userAgent As String, cookies As CookieContainer) As HttpWebResponse
+            System.Net.ServicePointManager.Expect100Continue = False '防止417
+
             If String.IsNullOrEmpty(url) Then
                 Throw New ArgumentNullException("url")
             End If
diff --git a/Windows/KUAS WiFi/My Project/AssemblyInfo.vb b/Windows/KUAS WiFi/My Project/AssemblyInfo.vb
index 3c02bd8..2ea196b 100644
--- a/Windows/KUAS WiFi/My Project/AssemblyInfo.vb	
+++ b/Windows/KUAS WiFi/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' 指定為預設值: 
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.0.9.24")>
-<Assembly: AssemblyFileVersion("1.0.9.24")>
+<Assembly: AssemblyVersion("2.1.6.0")>
+<Assembly: AssemblyFileVersion("2.1.6.0")>