* there we go

1 files changed, 19 insertions, 83 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 256e03c..b5a082e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,27 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.connectbot">
-	<application android:icon="@drawable/icon" android:label="newcb">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="org.connectbot"
+	android:versionName="1.0"
+	android:versionCode="100">
+	
+	<application
+		android:icon="@drawable/icon"
+		android:label="@string/app_name"
+		android:description="@string/app_desc">
 
-		<activity android:name=".HostList">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+		<activity android:name=".HostListActivity" >
+			<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.CREATE_SHORTCUT" />
 				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
 		</activity>
 
-		<activity android:name=".HostEditor" />
-		<activity android:name=".SettingsActivity" />
-		<activity android:name=".AboutActivity" />
+		<activity android:name=".HostEditorActivity" android:configChanges="keyboardHidden|orientation" />
+		<activity android:name=".SettingsActivity" android:configChanges="keyboardHidden|orientation" />
+		<activity android:name=".WizardActivity" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name=".WizardActivity" />
 
-		<service android:name="org.connectbot.service.TerminalManager" />
+		<service android:name="org.connectbot.service.TerminalManager" android:configChanges="keyboardHidden|orientation" />
 	 
-		<activity android:name="org.connectbot.Console" android:screenOrientation="landscape">
+		<activity android:name=".ConsoleActivity" android:screenOrientation="landscape" android:configChanges="keyboardHidden|orientation">
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW" />
 				<category android:name="android.intent.category.DEFAULT" />
@@ -30,80 +36,10 @@
 			</intent-filter>
 		</activity>
 
-
-<!-- package=org.theb.ssh 		
-		
-		<activity android:name=".Console" android:screenOrientation="landscape">
-		</activity>
-
-
-	 -->
-	 
-
-    	<provider android:name="org.theb.ssh.HostDbProvider" android:authorities="org.theb.provider.HostDb"/>
-
-        <activity android:name="org.theb.ssh.HostsList" android:label="@string/title_hosts_list">
-            <intent-filter>
-                <action android:name="android.intent.action.PICK" />
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.intent.action.EDIT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.dir/vnd.theb.host" />
-            </intent-filter>
-            
-        </activity>
-            <!-- 
-        <activity android:name="HostEditor" android:label="@string/title_host"
-        				android:theme="@android:style/Theme.Dialog">
-            <intent-filter android:label="@string/resolve_edit">
-                <action android:name="org.theb.ssh.action.EDIT_HOST" />
-                <action android:name="org.theb.ssh.action.EDIT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                
-                <category android:name="android.intent.category.ALTERNATIVE" />
-                
-                <category android:name="android.intent.category.SELECTED_ALTERNATIVE" />
-
-                
-				<data android:mimeType="vnd.android.cursor.item/vnd.theb.host" />
-			</intent-filter>
-            
-            <intent-filter>
-                <action android:name="android.intent.action.INSERT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.dir/vnd.theb.host" />
-            </intent-filter>
-        </activity>
-         -->
-		<activity android:name="org.theb.ssh.SecureShell" android:label="@string/title_shell">
-            <intent-filter android:label="@string/resolve_connect">
-                <action android:name="org.theb.ssh.action.CONNECT_HOST" />
-                <action android:name="android.intent.action.PICK" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.item/vnd.theb.host" />
-            </intent-filter>
-        </activity>
-        
-        <activity android:name="org.theb.ssh.PasswordDialog" android:label="@string/title_password"
-        		android:theme="@android:style/Theme.Dialog">
-        </activity>
-        
-        <activity android:name="org.theb.ssh.TouchEntropy" android:label="@string/title_entropy"
-        		android:theme="@android:style/Theme.Dialog">
-        </activity>
-        
-        <activity android:name="org.theb.ssh.Pubkey" android:label="@string/title_pubkey"
-        		android:theme="@android:style/Theme.Dialog">
-        </activity> 
-
-
-
-
 	</application>
 	 
 	<uses-permission android:name="android.permission.INTERNET" />
 	
-	
 </manifest>