fixed merge conflict

src/de/tudarmstadt/informatik/hostage/ui2/activity/MainActivity.java

@@ -53,9 +53,10 @@ public class MainActivity extends Activity {
         drawerItems.add(new DrawerListItem(R.string.drawer_threat_map, R.drawable.ic_menu_mapmode));
         drawerItems.add(new DrawerListItem(R.string.drawer_records, R.drawable.ic_menu_gallery));
         drawerItems.add(new DrawerListItem(R.string.drawer_services, R.drawable.ic_menu_set_as));
-        drawerItems.add(new DrawerListItem(R.string.drawer_settings, R.drawable.ic_menu_settings_holo_light));
+        drawerItems.add(new DrawerListItem(R.string.drawer_settings, R.drawable.ic_menu_preferences));
         drawerItems.add(new DrawerListItem(R.string.drawer_app_info, R.drawable.ic_menu_info_details));
 
+
         DrawerListAdapter listAdapter = new DrawerListAdapter(this, drawerItems);
 
         mDrawerList.setAdapter(listAdapter);

target/classes/META-INF/MANIFEST.MF

@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-Build-Jdk: 1.7.0_25
-Built-By: mip
-Created-By: Maven Integration for Eclipse
-

target/classes/META-INF/maven/de.tudarmstadt.informatik/hostage/pom.properties

@@ -1,7 +0,0 @@
-#Generated by Maven Integration for Eclipse
-#Fri Nov 22 14:55:17 CET 2013
-version=2.0.0-SNAPSHOT
-groupId=de.tudarmstadt.informatik
-m2e.projectName=hostage
-m2e.projectLocation=/home/mip/workspace/hostage
-artifactId=hostage

target/classes/META-INF/maven/de.tudarmstadt.informatik/hostage/pom.xml

@@ -1,82 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>de.tudarmstadt.informatik</groupId>
-	<artifactId>hostage</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<packaging>apk</packaging>
-	<name>HosTaGe</name>
-	<dependencies>
-		<dependency>
-			<groupId>android</groupId>
-			<artifactId>android</artifactId>
-			<version>4.4_r1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>android.support</groupId>
-			<artifactId>compatibility-v4</artifactId>
-			<version>19.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.roboguice</groupId>
-			<artifactId>roboguice</artifactId>
-			<version>2.0</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<finalName>${project.artifactId}</finalName>
-		<sourceDirectory>src</sourceDirectory>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-					<artifactId>android-maven-plugin</artifactId>
-					<version>3.8.0</version>
-					<extensions>true</extensions>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											com.jayway.maven.plugins.android.generation2
-										</groupId>
-										<artifactId>
-											android-maven-plugin
-										</artifactId>
-										<versionRange>
-											[3.8.0,)
-										</versionRange>
-										<goals>
-											<goal>consume-aar</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-				<artifactId>android-maven-plugin</artifactId>
-				<configuration>
-					<sdk>
-						<platform>19</platform>
-					</sdk>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>

target/generated-sources/r/de/tudarmstadt/informatik/hostage/R.java

@@ -43,9 +43,15 @@ public final class R {
         public static final int ic_menu_home=0x7f020002;
         public static final int ic_menu_info_details=0x7f020003;
         public static final int ic_menu_mapmode=0x7f020004;
+<<<<<<< HEAD
+        public static final int ic_menu_preferences=0x7f020005;
+        public static final int ic_menu_set_as=0x7f020006;
+        public static final int ic_menu_settings_holo_light=0x7f020007;
+=======
         public static final int ic_menu_set_as=0x7f020005;
         public static final int ic_menu_settings_holo_light=0x7f020006;
         public static final int ic_navigation_drawer=0x7f020007;
+>>>>>>> cf4caa5dbc324ae8f490b78d7f9bc3d14c90dcbd
         public static final int ic_service_green=0x7f020008;
         public static final int ic_service_red=0x7f020009;
         public static final int ic_service_yellow=0x7f02000a;

target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Nov 22 16:32:37 CET 2013
+#Mon Jan 13 18:25:42 CET 2014
 version=2.0.0-SNAPSHOT
 groupId=de.tudarmstadt.informatik
 artifactId=hostage

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -5,15 +5,15 @@ de/tudarmstadt/informatik/hostage/ui/ViewLog.class
 de/tudarmstadt/informatik/hostage/protocol/TELNET.class
 de/tudarmstadt/informatik/hostage/R$dimen.class
 de/tudarmstadt/informatik/hostage/ui/MainActivity$5.class
-de/tudarmstadt/informatik/hostage/system/PrivilegedPort.class
 de/tudarmstadt/informatik/hostage/protocol/HTTPS.class
+de/tudarmstadt/informatik/hostage/system/PrivilegedPort.class
 de/tudarmstadt/informatik/hostage/io/ByteArrayReaderWriter.class
 de/tudarmstadt/informatik/hostage/protocol/SMB$SMBPacket.class
 de/tudarmstadt/informatik/hostage/ui/ListViewAdapter.class
 de/tudarmstadt/informatik/hostage/format/DefaultFormatter.class
 de/tudarmstadt/informatik/hostage/ui/MainActivity$SetExternalIPTask.class
-de/tudarmstadt/informatik/hostage/ui/MainActivity$4.class
 de/tudarmstadt/informatik/hostage/HoneyService$1.class
+de/tudarmstadt/informatik/hostage/ui/MainActivity$4.class
 de/tudarmstadt/informatik/hostage/ui/ViewLog$2.class
 de/tudarmstadt/informatik/hostage/protocol/TELNET$1.class
 de/tudarmstadt/informatik/hostage/protocol/FTP$STATE.class
@@ -24,6 +24,7 @@ de/tudarmstadt/informatik/hostage/logging/Record.class
 de/tudarmstadt/informatik/hostage/net/MySSLSocketFactory$1.class
 de/tudarmstadt/informatik/hostage/BuildConfig.class
 de/tudarmstadt/informatik/hostage/R$style.class
+de/tudarmstadt/informatik/hostage/logging/MyLocationManager$StopTask.class
 de/tudarmstadt/informatik/hostage/protocol/MySQL$STATE.class
 de/tudarmstadt/informatik/hostage/ui2/activity/MainActivity$DrawerItemClickListener.class
 de/tudarmstadt/informatik/hostage/ui/MainActivity$2.class
@@ -31,21 +32,32 @@ de/tudarmstadt/informatik/hostage/R$anim.class
 de/tudarmstadt/informatik/hostage/ui2/model/DrawerListItem.class
 de/tudarmstadt/informatik/hostage/protocol/Protocol$TALK_FIRST.class
 de/tudarmstadt/informatik/hostage/ui/ViewLog$8.class
-de/tudarmstadt/informatik/hostage/logging/DatabaseHandler.class
 de/tudarmstadt/informatik/hostage/R$id.class
+<<<<<<< HEAD
+=======
+de/tudarmstadt/informatik/hostage/logging/DatabaseHandler.class
+de/tudarmstadt/informatik/hostage/ui2/MainActivity.class
+de/tudarmstadt/informatik/hostage/logging/MyLocationManager.class
+>>>>>>> 5dee346350cf553ceb775ff10818e2a7f3a2c5c2
 de/tudarmstadt/informatik/hostage/ui/ViewLog$7.class
 de/tudarmstadt/informatik/hostage/protocol/Protocol.class
 de/tudarmstadt/informatik/hostage/format/ProtocolFormatter.class
 de/tudarmstadt/informatik/hostage/R$drawable.class
-de/tudarmstadt/informatik/hostage/logging/Logger.class
-de/tudarmstadt/informatik/hostage/R$layout.class
 de/tudarmstadt/informatik/hostage/format/LogViewFormatter.class
+<<<<<<< HEAD
 de/tudarmstadt/informatik/hostage/ui2/fragment/HomeFragment.class
 de/tudarmstadt/informatik/hostage/protocol/SSH$1.class
 de/tudarmstadt/informatik/hostage/protocol/MySQL$1.class
 de/tudarmstadt/informatik/hostage/ui2/activity/MainActivity.class
 de/tudarmstadt/informatik/hostage/ui/ViewLog$3.class
+=======
+de/tudarmstadt/informatik/hostage/R$layout.class
+de/tudarmstadt/informatik/hostage/logging/Logger.class
+de/tudarmstadt/informatik/hostage/protocol/SSH$1.class
+de/tudarmstadt/informatik/hostage/protocol/MySQL$1.class
+>>>>>>> 5dee346350cf553ceb775ff10818e2a7f3a2c5c2
 de/tudarmstadt/informatik/hostage/R$xml.class
+de/tudarmstadt/informatik/hostage/ui/ViewLog$3.class
 de/tudarmstadt/informatik/hostage/protocol/HTTP.class
 de/tudarmstadt/informatik/hostage/format/MySQLFormatter.class
 de/tudarmstadt/informatik/hostage/Manifest.class
@@ -65,14 +77,17 @@ de/tudarmstadt/informatik/hostage/ui/MainActivity$3.class
 de/tudarmstadt/informatik/hostage/protocol/TELNET$STATE.class
 de/tudarmstadt/informatik/hostage/HoneyListener.class
 de/tudarmstadt/informatik/hostage/ui2/adapter/DrawerListAdapter.class
-de/tudarmstadt/informatik/hostage/ui/ViewLog$1.class
+de/tudarmstadt/informatik/hostage/logging/MyLocationManager$1.class
 de/tudarmstadt/informatik/hostage/ui/SettingsActivity.class
+de/tudarmstadt/informatik/hostage/ui/ViewLog$1.class
 de/tudarmstadt/informatik/hostage/protocol/FTP$1.class
 de/tudarmstadt/informatik/hostage/wrapper/ByteArray.class
 de/tudarmstadt/informatik/hostage/R$string.class
+de/tudarmstadt/informatik/hostage/ui/ViewLogTable$1.class
+de/tudarmstadt/informatik/hostage/ui/ViewLogTable$RecordComparator.class
+de/tudarmstadt/informatik/hostage/io/ReaderWriter.class
 de/tudarmstadt/informatik/hostage/ui/ViewLog$6.class
 de/tudarmstadt/informatik/hostage/protocol/SMB.class
-de/tudarmstadt/informatik/hostage/io/ReaderWriter.class
 de/tudarmstadt/informatik/hostage/HoneyService.class
 de/tudarmstadt/informatik/hostage/ui/AboutActivity.class
 de/tudarmstadt/informatik/hostage/R$attr.class
@@ -85,8 +100,12 @@ de/tudarmstadt/informatik/hostage/protocol/ECHO.class
 de/tudarmstadt/informatik/hostage/protocol/SSH$STATE.class
 de/tudarmstadt/informatik/hostage/ui/MainActivity.class
 de/tudarmstadt/informatik/hostage/protocol/MySQL.class
-de/tudarmstadt/informatik/hostage/ui/MainActivity$1.class
 de/tudarmstadt/informatik/hostage/logging/Record$TYPE.class
+<<<<<<< HEAD
+=======
+de/tudarmstadt/informatik/hostage/ui/MainActivity$1.class
+de/tudarmstadt/informatik/hostage/ui2/adapter/DrawerListItem.class
+>>>>>>> 5dee346350cf553ceb775ff10818e2a7f3a2c5c2
 de/tudarmstadt/informatik/hostage/handler/StringHandler.class
 de/tudarmstadt/informatik/hostage/ui/MainActivity$6.class
 de/tudarmstadt/informatik/hostage/R$menu.class

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,42 +1,46 @@
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/ui/ListViewAdapter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/TELNET.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/handler/StringHandler.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/format/TELNETFormatter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/ui/ViewLogTable.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/net/MySSLSocketFactory.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/logging/DatabaseHandler.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/net/MyServerSocketFactory.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/io/ByteArrayReaderWriter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/ECHO.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/io/ReaderWriter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/SSLProtocol.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/format/LogViewFormatter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/HTTPS.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/wrapper/ByteArray.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/commons/HelperUtils.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/FTP.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/SSH.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/format/ProtocolFormatter.java
-/home/mip/workspace/hostage/target/generated-sources/r/de/tudarmstadt/informatik/hostage/BuildConfig.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/SMB.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/HoneyService.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/format/MySQLFormatter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/HoneyListener.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/io/StringReaderWriter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/ui/SettingsActivity.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/MySQL.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/format/DefaultFormatter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/logging/SQLLogger.java
-/home/mip/workspace/hostage/target/generated-sources/r/de/tudarmstadt/informatik/hostage/R.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/Protocol.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/handler/ByteArrayHandler.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/system/PrivilegedPort.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/ui/MainActivity.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/ui/AboutActivity.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/logging/Record.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/ui/ViewLog.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/format/SMBFormatter.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/ConnectionRegister.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/logging/Logger.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/protocol/HTTP.java
-/home/mip/workspace/hostage/src/de/tudarmstadt/informatik/hostage/handler/AbstractHandler.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/ui2/adapter/DrawerListItem.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/format/ProtocolFormatter.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/logging/MyLocationManager.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/ui/ViewLog.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/system/PrivilegedPort.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/format/MySQLFormatter.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/HoneyService.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/protocol/ECHO.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/HoneyListener.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/ui/ViewLogTable.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/io/StringReaderWriter.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/protocol/TELNET.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/ui/AboutActivity.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/net/MySSLSocketFactory.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/logging/Logger.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/protocol/SSH.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/protocol/HTTPS.java
+/home/bigd/dev/scm-ssi-student-hostagev2/target/generated-sources/r/de/tudarmstadt/informatik/hostage/R.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/protocol/Protocol.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/protocol/SSLProtocol.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/io/ReaderWriter.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/wrapper/ByteArray.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/ui2/adapter/DrawerListAdapter.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/format/LogViewFormatter.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/handler/ByteArrayHandler.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/ConnectionRegister.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/commons/HelperUtils.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/logging/SQLLogger.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/net/MyServerSocketFactory.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/logging/Record.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/protocol/FTP.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/io/ByteArrayReaderWriter.java
+/home/bigd/dev/scm-ssi-student-hostagev2/target/generated-sources/r/de/tudarmstadt/informatik/hostage/BuildConfig.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/handler/AbstractHandler.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/logging/DatabaseHandler.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/ui/ListViewAdapter.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/ui/MainActivity.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/ui/SettingsActivity.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/protocol/HTTP.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/format/TELNETFormatter.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/format/DefaultFormatter.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/ui2/MainActivity.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/handler/StringHandler.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/format/SMBFormatter.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/protocol/SMB.java
+/home/bigd/dev/scm-ssi-student-hostagev2/src/de/tudarmstadt/informatik/hostage/protocol/MySQL.java