Några småfixar

.classpath

@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry including="nu/dll/io/*.java|nu/dll/lyskom/*.java" kind="src" path="lattekom"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry including="nu/dll/io/*.java|nu/dll/lyskom/*.java" kind="src" path="lattekom"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="lib" path="lattekom/nu/dll" sourcepath="lattekom/nu/dll/lyskom"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "lattekom"]
 	path = lattekom
-	url = http://github.com/pajp/lattekom.git
+	url = http://github.com/jonasgit/lattekom.git

.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +1,81 @@
-#Fri Jul 23 21:03:53 GMT+01:00 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5

AndroidManifest.xml

@@ -1,81 +1,150 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.lindev.androkom"
-      android:versionName="0.4.5" android:versionCode="8" android:installLocation="auto"> <!-- bump versionCode on release -->
-    <application android:name="org.lindev.androkom.App"
-                 android:icon="@drawable/icon" android:label="@string/app_name">
+      android:versionName="1.0.8++" android:versionCode="50" android:installLocation="auto"> <!-- bump versionCode on release -->
+
+  <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="19"/>
+
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.WAKE_LOCK" />
+  <uses-permission android:name="android.permission.VIBRATE" />
+  <uses-permission android:name="org.openintents.safe.ACCESS_SERVICE" />
+  <uses-permission android:name="org.openintents.safe.ACCESS_INTENTS" />
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+  <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+  <!-- Needed to check when the network connection changes -->
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
+
+  <application android:name="org.lindev.androkom.App"
+                 android:icon="@drawable/icon"
+                 android:label="@string/app_name"
+                 >
+
     	<!--  List of conferences with unread texts -->
         <activity android:name=".ConferenceList"
-                  android:label="@string/conference_list">          
+                  android:label="@string/conference_list"
+                  android:launchMode="singleTop">          
         </activity>
 
-         <!--  A single conference -->
+        <!--  List of unread texts in current conference -->
+        <activity android:name=".ConferenceTextList"
+                  android:label="@string/conference_text_list"
+                  android:launchMode="singleTop">          
+        </activity>
+
+        <!--  A single conference -->
          <activity android:name=".Conference"       
-                   android:label="@string/conference">
+                   android:label="@string/conference"
+                   android:launchMode="singleTop">
         </activity>
 
          <!--  Create a KOM message -->
-         <activity android:name=".CreateText"       
-                   android:label="@string/create_text"
-                   android:windowSoftInputMode="stateVisible|adjustResize">
-        </activity>
 
          <!--  Create a KOM message -->
-         <activity android:name=".CreateNewText"       
-                   android:label="@string/create_new_text"
-                   android:windowSoftInputMode="stateVisible|adjustResize">
-        </activity>
 
          <!--  Create a KOM IM -->
-         <activity android:name=".CreateNewIM"       
-                   android:label="@string/create_new_IM"
-                   android:windowSoftInputMode="stateVisible|adjustResize">
-        </activity>
 
          <!--  Who Is On -->
          <activity android:name=".WhoIsOn"       
-                   android:label="@string/seewhoison_label">
+                   android:label="@string/seewhoison_label"
+                   android:launchMode="singleTop">
         </activity>
 
          <!--  Endast -->
          <activity android:name=".Endast"       
-                   android:label="@string/endast_label">
-        </activity>
+                   android:label="@string/endast_label"
+                   android:launchMode="singleTop">
+         </activity>
 
-         <!--  MessageLog -->
-         <activity android:name=".MessageLog"
-                   android:label="@string/message_log_label">
-        </activity>
+         <!--  See again dialog -->
+         <activity android:name=".SeeAgainTexts"       
+                   android:label="@string/seeagaintexts_label"
+                   android:launchMode="singleTop">
+         </activity>
+
+         <!--  See again text list -->
+         <activity android:name=".SeeAgainTextList"       
+                   android:label="@string/seeagaintextlist_label"
+                   android:launchMode="singleTop">
+         </activity>
+
+         <!--  Lista markerade -->
+         <activity android:name=".MarkedTextList"       
+                   android:label="@string/showmarkedtexts_label"
+                   android:launchMode="singleTop">
+         </activity>
+
+         <!--  Join Conference -->
+         <activity android:name=".JoinConference"       
+                   android:label="@string/joinconference_label"
+                   android:launchMode="singleTop">
+         </activity>
+
+         <!--  Add Recipient -->
+         <activity android:name=".AddNewRecipientToText"       
+                   android:label="@string/add_recipient_label"
+                   android:launchMode="singleTop">
+         </activity>
+
+         <!--  Add Comment -->
+         <activity android:name=".AddNewCommentToText"       
+                   android:label="@string/add_comment_label"
+                   android:launchMode="singleTop">
+         </activity>
+
+             <!--  MessageLog -->
+         <activity android:name=".gui.MessageLog"
+                   android:label="@string/message_log_label"
+                   android:launchMode="singleTop">
+         </activity>
 
          <!--  Login dialog -->
          <activity android:name=".Login"       
                    android:label="@string/app_name"
-                   android:windowSoftInputMode="stateVisible|adjustResize">
+                   android:windowSoftInputMode="stateVisible|adjustResize"
+                   android:launchMode="singleTop">
 
            <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.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+           </intent-filter>
+
+           <intent-filter>
+                <action android:name="android.intent.action.SENDTO" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="imto" android:host="lyskom" />
+           </intent-filter>
         </activity>
 
         <activity android:name=".Prefs"
-                  android:label="@string/settings_title">
+                  android:label="@string/settings_title"
+                  android:launchMode="singleTop">
         </activity>
 
         <activity android:name=".ConferencePrefs"
-                  android:label="@string/settings_title">
+                  android:label="@string/settings_title"
+                  android:launchMode="singleTop">
         </activity>
 
         <!--  Connection to the KOM server -->
         <service android:name=".KomServer"
         		 android:label="@string/app_name">        	
-        </service>        
-
-    </application>
+        </service>
+        <activity android:name=".gui.IMConversationList" android:label="@string/im_conversations_list_label" android:launchMode="singleTop"></activity>
+        <activity android:name=".gui.IMConversation" android:launchMode="singleTop"></activity>
+        <activity android:name=".gui.TextCreator"></activity>
+
+        <activity android:name=".gui.ImgTextCreator" >
+        </activity>
+</application>
 
-<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8"/>
-<uses-permission android:name="android.permission.INTERNET" />
-<uses-permission android:name="android.permission.WAKE_LOCK" />
-<uses-permission android:name="org.openintents.safe.ACCESS_INTENTS"	/>
 </manifest>