From cf96d5592356bb324d6b08891f3ff6b39988cfa9 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sun, 7 Feb 2010 22:45:47 +0000
Subject: Don't blow up when we get random URIs

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@470 df292f66-193f-0410-a5fc-6d59da041ff2
---
 AndroidManifest.xml                        |  2 +-
 src/org/connectbot/PubkeyListActivity.java | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8a658ad..2fe1fab 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.connectbot"
 	android:versionName="1.7-dev"
-	android:versionCode="249">
+	android:versionCode="250">
 
 	<application
 		android:icon="@drawable/icon"
diff --git a/src/org/connectbot/PubkeyListActivity.java b/src/org/connectbot/PubkeyListActivity.java
index df21b7b..41422fe 100644
--- a/src/org/connectbot/PubkeyListActivity.java
+++ b/src/org/connectbot/PubkeyListActivity.java
@@ -494,12 +494,16 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 		case REQUEST_CODE_PICK_FILE:
 			if (resultCode == RESULT_OK && intent != null) {
 				Uri uri = intent.getData();
-				if (uri != null) {
-					readKeyFromFile(new File(URI.create(uri.toString())));
-				} else {
-					String filename = intent.getDataString();
-					if (filename != null)
-						readKeyFromFile(new File(URI.create(filename)));
+				try {
+					if (uri != null) {
+						readKeyFromFile(new File(URI.create(uri.toString())));
+					} else {
+						String filename = intent.getDataString();
+						if (filename != null)
+							readKeyFromFile(new File(URI.create(filename)));
+					}
+				} catch (IllegalArgumentException e) {
+					Log.e(TAG, "Couldn't read from picked file", e);
 				}
 			}
 			break;
-- 
cgit v1.2.3