From 568069fc1e01ea97b28bc82b462c238d81ee1abe Mon Sep 17 00:00:00 2001
From: snow <120940610@qq.com>
Date: Thu, 21 Jun 2018 14:50:42 +0800
Subject: [PATCH 1/3] java.lang.NullPointerException may happened in
 data.getExtras()

---
 .../org/ebayopensource/fidouafclient/MainActivity.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fidouafclient/app/src/main/java/org/ebayopensource/fidouafclient/MainActivity.java b/fidouafclient/app/src/main/java/org/ebayopensource/fidouafclient/MainActivity.java
index 9192ad5..3ca80df 100644
--- a/fidouafclient/app/src/main/java/org/ebayopensource/fidouafclient/MainActivity.java
+++ b/fidouafclient/app/src/main/java/org/ebayopensource/fidouafclient/MainActivity.java
@@ -250,13 +250,14 @@ public void trxRequest(View view) {
     }
 
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        Log.d(TAG, String.format("onActivityResult: requestCode=%d, resultCode=%d, data=%s",
-                requestCode, resultCode, new ArrayList<>(data.getExtras().keySet())));
-
         if (data == null){
             msg.setText("UAF Client didn't return any data. resultCode="+resultCode);
             return;
         }
+        //java.lang.NullPointerException may happened in data.getExtras()
+        Log.d(TAG, String.format("onActivityResult: requestCode=%d, resultCode=%d, data=%s",
+                requestCode, resultCode, new ArrayList<>(data.getExtras().keySet())));
+
 
         Object[] array = data.getExtras().keySet().toArray();
         StringBuffer extras = new StringBuffer();

From 8103675b37b24461f130ef7e33ad6d7849adcf36 Mon Sep 17 00:00:00 2001
From: snow <120940610@qq.com>
Date: Thu, 21 Jun 2018 15:00:49 +0800
Subject: [PATCH 2/3] username may include special charater e.g.'\n' may occur
 exception

---
 .../java/org/ebayopensource/fidouafclient/MainActivity.java     | 2 +-
 fidouafclient/app/src/main/res/layout/activity_main.xml         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/fidouafclient/app/src/main/java/org/ebayopensource/fidouafclient/MainActivity.java b/fidouafclient/app/src/main/java/org/ebayopensource/fidouafclient/MainActivity.java
index 3ca80df..47c43dc 100644
--- a/fidouafclient/app/src/main/java/org/ebayopensource/fidouafclient/MainActivity.java
+++ b/fidouafclient/app/src/main/java/org/ebayopensource/fidouafclient/MainActivity.java
@@ -140,7 +140,7 @@ public void info(View view) {
 
     public void regRequest(View view) {
 //        String username = Preferences.getSettingsParam("username");
-        String username = ((EditText) findViewById(R.id.editTextName)).getText().toString();
+        String username = ((EditText) findViewById(R.id.editTextName)).getText().toString().trim();
         if (username.equals ("")) {
             msg.setText("Username cannot be empty.");
             return;
diff --git a/fidouafclient/app/src/main/res/layout/activity_main.xml b/fidouafclient/app/src/main/res/layout/activity_main.xml
index 49a2bbf..75ba8df 100644
--- a/fidouafclient/app/src/main/res/layout/activity_main.xml
+++ b/fidouafclient/app/src/main/res/layout/activity_main.xml
@@ -40,6 +40,7 @@
         android:id="@+id/editTextName"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:singleLine="true"
         android:layout_toRightOf="@id/regButton"
         />
 

From 615a2294d61f79e88d5778f3ef9f8dfe9eb005fa Mon Sep 17 00:00:00 2001
From: snow <120940610@qq.com>
Date: Thu, 21 Jun 2018 15:44:59 +0800
Subject: [PATCH 3/3] java.lang.NullPointerException at:
 org.ebayopensource.fidouaf.res.FidoUafResource.readFacet(FidoUafResource.java:215)

---
 .../java/org/ebayopensource/fidouaf/res/FidoUafResource.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fidouaf/src/main/java/org/ebayopensource/fidouaf/res/FidoUafResource.java b/fidouaf/src/main/java/org/ebayopensource/fidouaf/res/FidoUafResource.java
index 0bcd5e0..7a4051c 100644
--- a/fidouaf/src/main/java/org/ebayopensource/fidouaf/res/FidoUafResource.java
+++ b/fidouaf/src/main/java/org/ebayopensource/fidouaf/res/FidoUafResource.java
@@ -214,7 +214,7 @@ private String readFacet() {
 			Properties props = new Properties();
 			props.load(in);
 			facetVal = props.getProperty("facetId");
-		} catch (IOException e) {
+		} catch (Exception e) {
 			e.printStackTrace();
 		} 
 		return facetVal.toString();