Fix for TLS issue

GEANT · Jan 17, 2019 · 13961e2 · 13961e2
1 parent 0c2c724
commit 13961e2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="uk.ac.swansea.eduroamcat"
-    android:versionCode="54"
-    android:versionName="1.2.9">
+    android:versionCode="55"
+    android:versionName="1.2.10">
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />

diff --git a/src/uk/ac/swansea/eduroamcat/ConnectFragment.java b/src/uk/ac/swansea/eduroamcat/ConnectFragment.java
@@ -214,7 +214,7 @@ public String getStoredUsername()
 			if (db.numberOfRowsUSER()>0)
 			{  	
 				username=db.getUser();
-				if (username == null) username = "";
+				if (username.isEmpty()) username = "";
 			}
 			else
 			{

diff --git a/src/uk/ac/swansea/eduroamcat/WifiConfigAPI18.java b/src/uk/ac/swansea/eduroamcat/WifiConfigAPI18.java
@@ -242,6 +242,14 @@ else if (aAuth.getInnerNonEAPType()==0) {
                     userName = aAuth.getClientPrivateKeySubjectCN();
                     enterpriseConfig.setIdentity(userName);
                     debug("Using Username:" + userName);
+                }
+                else
+                {
+                    if ( aAuth.getClientPrivateKeySubjectCN() != null && aAuth.getClientPrivateKeySubjectCN().length()>0) {
+                        userName = aAuth.getClientPrivateKeySubjectCN();
+                        enterpriseConfig.setIdentity(userName);
+                        debug("Using Username:" + userName);
+                    }
                 }
 			}