Updated for 0.9 SDK

6 files changed, 18 insertions, 11 deletions

diff --git a/.classpath b/.classpath
index 9a5c3f1..ef7c361 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.project.AndroidClasspathContainerInitializer"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.project b/.project
index 260be6e..b1be20b 100644
--- a/.project
+++ b/.project
@@ -27,7 +27,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 89fb231..470a88d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,10 +6,10 @@
     	<provider android:name="HostDbProvider"
     		android:authorities="org.theb.provider.HostDb"/>
         <activity android:name="HostsList" android:label="@string/title_hosts_list">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+
+
+
+
             <intent-filter>
                 <action android:name="android.intent.action.PICK" />
                 <action android:name="android.intent.action.VIEW" />
@@ -38,7 +38,7 @@
                      can perform when selecting this type of data. -->
                 <category android:name="android.intent.category.SELECTED_ALTERNATIVE" />
 
-                <type android:value="vnd.android.cursor.item/vnd.theb.host" />
+                <type android:mimeType="vnd.android.cursor.item/vnd.theb.host" />
             </intent-filter>
             
             <!-- This filter says that we can create a new note inside
@@ -46,18 +46,23 @@
             <intent-filter>
                 <action android:name="android.intent.action.INSERT" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <type android:value="vnd.android.cursor.dir/vnd.theb.host" />
+                <type android:mimeType="vnd.android.cursor.dir/vnd.theb.host" />
             </intent-filter>
         </activity>
         
 		<activity android:name="SecureShell" android:label="@string/title_shell">
             <!-- This filter says that we can connect to a host -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
             <intent-filter android:label="@string/resolve_connect">
                 <action android:name="org.theb.ssh.action.CONNECT_HOST" />
                 <action android:name="android.intent.action.PICK" />
                 <!-- DEFAULT: execute if being directly invoked. -->
                 <category android:name="android.intent.category.DEFAULT" />
-                <type android:value="vnd.android.cursor.item/vnd.theb.host" />
+                <type android:mimeType="vnd.android.cursor.item/vnd.theb.host" />
             </intent-filter>
         </activity>
         
@@ -73,4 +78,5 @@
         		android:theme="@android:style/Theme.Dialog">
         </activity> 
     </application>
+    <uses-permission android:name="android.permission.INTERNET" />
 </manifest> 
\ No newline at end of file
diff --git a/res/layout/host_editor.xml b/res/layout/host_editor.xml
index c25f98f..ced7653 100644
--- a/res/layout/host_editor.xml
+++ b/res/layout/host_editor.xml
@@ -47,7 +47,7 @@
     <Button android:id="@+id/cancel"
     		android:layout_width="wrap_content" 
             android:layout_height="wrap_content"
-            android:layout_toLeft="@id/add"
+            android:layout_toLeftOf="@id/add"
             android:layout_alignTop="@id/add"
             android:text="@string/button_cancel" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/main.xml b/res/layout/main.xml
index ec1ce98..9219a8f 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -4,6 +4,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     >
+    
 <TextView android:id="@+id/shell"
     android:layout_width="fill_parent" 
     android:layout_height="wrap_content" 
diff --git a/res/layout/pubkey.xml b/res/layout/pubkey.xml
index f031e3c..1c2828a 100644
--- a/res/layout/pubkey.xml
+++ b/res/layout/pubkey.xml
@@ -27,7 +27,7 @@
     <Button android:id="@+id/cancel"
     		android:layout_width="wrap_content" 
             android:layout_height="wrap_content"
-            android:layout_toLeft="@id/ok"
+            android:layout_toLeftOf="@id/ok"
             android:layout_alignTop="@id/ok"
             android:text="@string/button_cancel" />
 </RelativeLayout>
\ No newline at end of file