fixed merge conflicts

res/layout/profile_manager_list_item.xml

@@ -114,7 +114,7 @@
 	        android:layout_alignParentLeft="true"
 	        android:layout_alignParentStart="true" android:scaleType="centerInside"/>
 
-		<de.tudarmstadt.informatik.hostage.ui2.layouts.FlowLayout
+		<de.tudarmstadt.informatik.hostage.ui.layouts.FlowLayout
 				xmlns:f="http://schemas.android.com/apk/res/de.tudarmstadt.informatik.hostage"
 				android:orientation="horizontal"
 				android:layout_width="fill_parent"
@@ -132,7 +132,7 @@
 					android:textAppearance="?android:attr/textAppearanceSmall"
 					style="@style/ProfileManagerListBadge"
 					android:id="@+id/record_details_text_ssid" android:layout_gravity="center_vertical" android:layout_marginLeft="10dp"/>
-		</de.tudarmstadt.informatik.hostage.ui2.layouts.FlowLayout>
+		</de.tudarmstadt.informatik.hostage.ui.layouts.FlowLayout>
 
 	</RelativeLayout>
 

res/values/version.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<integer name="google_play_services_lib_version">4323000</integer>
+	<integer name="google_play_services_lib_version">4452000</integer>
 </resources>

src/de/tudarmstadt/informatik/hostage/Hostage.java

@@ -238,16 +238,6 @@ public class Hostage extends Service {
 		}
 		return false;
 	}
-	
-	public boolean isRunningAnyPort(String protocolName){
-		for(Listener listener: listeners){
-			if(listener.getProtocolName().equals(protocolName)){
-				if(listener.isRunning()) return true;
-			}
-		}
-
-		return false;
-	}
 
 	/**
 	 * Notifies the GUI about a event.

src/de/tudarmstadt/informatik/hostage/deprecated/UglyDbHelper.java

@@ -15,7 +15,7 @@ import java.util.List;
 import de.tudarmstadt.informatik.hostage.logging.Record;
 import de.tudarmstadt.informatik.hostage.logging.MessageRecord.TYPE;
 import de.tudarmstadt.informatik.hostage.model.Profile;
-import de.tudarmstadt.informatik.hostage.ui2.model.LogFilter;
+import de.tudarmstadt.informatik.hostage.ui.model.LogFilter;
 
 /**
  * This class creates SQL tables and handles all access to the database.<br>

src/de/tudarmstadt/informatik/hostage/persistence/HostageDBOpenHelper.java

@@ -25,7 +25,7 @@ import de.tudarmstadt.informatik.hostage.persistence.HostageDBContract.PacketEnt
 import de.tudarmstadt.informatik.hostage.persistence.HostageDBContract.ProfileEntry;
 import de.tudarmstadt.informatik.hostage.persistence.HostageDBContract.SyncDeviceEntry;
 import de.tudarmstadt.informatik.hostage.persistence.HostageDBContract.SyncInfoEntry;
-import de.tudarmstadt.informatik.hostage.ui2.model.LogFilter;
+import de.tudarmstadt.informatik.hostage.ui.model.LogFilter;
 
 /**
  * Database Helper class to create, read and write the database.
@@ -853,19 +853,6 @@ public class HostageDBOpenHelper extends SQLiteOpenHelper {
 		db.close();
 	}
 	
-	/**
-	 * Deletes all records from {@link #TABLE_RECORDS} with a specific Attack ID.
-	 *
-	 * @param attackID
-	 *            The Attack ID to match against.
-	 */
-	public synchronized void deleteByAttackID(long attackID) {
-		SQLiteDatabase db = this.getReadableDatabase();
-		db.delete(AttackEntry.TABLE_NAME, AttackEntry.COLUMN_NAME_ATTACK_ID + " = ?", new String[] { String.valueOf(attackID) });
-		db.delete(PacketEntry.TABLE_NAME, PacketEntry.COLUMN_NAME_ATTACK_ID + " = ?", new String[] { String.valueOf(attackID) });
-		db.close();
-	}
-	
 	/**
 	 * Deletes all records from {@link #TABLE_RECORDS} with a specific Attack ID.
 	 *

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

@@ -1,4 +1,4 @@
-package de.tudarmstadt.informatik.hostage.ui2.activity;
+package de.tudarmstadt.informatik.hostage.ui.activity;
 
 import java.util.ArrayList;
 import java.util.List;

src/de/tudarmstadt/informatik/hostage/ui/adapter/ProfileManagerListAdapter.java

@@ -1,4 +1,4 @@
-package de.tudarmstadt.informatik.hostage.ui2.adapter;
+package de.tudarmstadt.informatik.hostage.ui.adapter;
 
 import android.app.AlertDialog;
 import android.content.Context;

src/de/tudarmstadt/informatik/hostage/ui/fragment/HomeFragment.java

@@ -30,7 +30,7 @@ import de.tudarmstadt.informatik.hostage.commons.HelperUtils;
 import de.tudarmstadt.informatik.hostage.persistence.ProfileManager;
 import de.tudarmstadt.informatik.hostage.model.Profile;
 import de.tudarmstadt.informatik.hostage.persistence.HostageDBOpenHelper;
-import de.tudarmstadt.informatik.hostage.ui.LogFilter;
+import de.tudarmstadt.informatik.hostage.ui.model.LogFilter;
 import de.tudarmstadt.informatik.hostage.ui.activity.MainActivity;
 import de.tudarmstadt.informatik.hostage.ui.fragment.opengl.ThreatIndicatorGLRenderer;
 
@@ -351,7 +351,7 @@ public class HomeFragment extends Fragment {
 			@Override
 			public void onClick(View v) {
 				Fragment fragment = new ProfileManagerFragment();
-				MainActivity.getInstance().injectFragment(fragment, false);
+				MainActivity.getInstance().injectFragment(fragment);
 			}
 		});
 

src/de/tudarmstadt/informatik/hostage/ui/fragment/ProfileEditFragment.java

@@ -288,9 +288,6 @@ public class ProfileEditFragment extends PreferenceFragment implements
 		super.onActivityResult(requestCode, resultCode, imageReturnedIntent);
 
 		if(resultCode == Activity.RESULT_OK){
-
-			assert selectedImage != null;
-
 			Cursor cursor = getActivity().getContentResolver().query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
 					new String[]{
 							MediaStore.Images.Media.DATA,

src/de/tudarmstadt/informatik/hostage/ui/fragment/RecordDetailFragment.java

@@ -20,7 +20,7 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 import de.tudarmstadt.informatik.hostage.R;
 import de.tudarmstadt.informatik.hostage.logging.Record;
-import de.tudarmstadt.informatik.hostage.ui.LogFilter;
+import de.tudarmstadt.informatik.hostage.ui.model.LogFilter;
 import de.tudarmstadt.informatik.hostage.ui.activity.MainActivity;
 import de.tudarmstadt.informatik.hostage.logging.MessageRecord;
 import de.tudarmstadt.informatik.hostage.persistence.HostageDBOpenHelper;

src/de/tudarmstadt/informatik/hostage/ui/fragment/RecordOverviewFragment.java

@@ -44,7 +44,7 @@ import de.tudarmstadt.informatik.hostage.logging.NetworkRecord;
 import de.tudarmstadt.informatik.hostage.logging.Record;
 import de.tudarmstadt.informatik.hostage.persistence.HostageDBOpenHelper;
 import de.tudarmstadt.informatik.hostage.sync.bluetooth.BluetoothSyncActivity;
-import de.tudarmstadt.informatik.hostage.sync.nfc.NFCSync;
+import de.tudarmstadt.informatik.hostage.sync.nfc.NFCSyncActivity;
 import de.tudarmstadt.informatik.hostage.sync.tracing.TracingSyncActivity;
 import de.tudarmstadt.informatik.hostage.ui.activity.MainActivity;
 import de.tudarmstadt.informatik.hostage.ui.adapter.RecordListAdapter;
@@ -368,7 +368,7 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
 								getActivity().startActivity(new Intent(getActivity(), BluetoothSyncActivity.class));
 								break;
 							case 1:
-								getActivity().startActivity(new Intent(getActivity(), NFCSync.class));
+								getActivity().startActivity(new Intent(getActivity(), NFCSyncActivity.class));
 								break;
 
 							case 2:

src/de/tudarmstadt/informatik/hostage/ui/fragment/ThreatMapFragment.java

@@ -107,7 +107,7 @@ public class ThreatMapFragment extends TrackerFragment implements GoogleMap.OnIn
 		recordOverviewFragment.setGroupKey("ESSID");
 		recordOverviewFragment.setAllowBack(true);
 
-		MainActivity.getInstance().injectFragment(recordOverviewFragment, false);
+		MainActivity.getInstance().injectFragment(recordOverviewFragment);
 		//recordOverviewFragment.showDetailsForSSID(getActivity(), ssid);
 		//}
 	}

src/de/tudarmstadt/informatik/hostage/ui/fragment/TrackerFragment.java

@@ -1,4 +1,4 @@
-package de.tudarmstadt.informatik.hostage.ui2.fragment;
+package de.tudarmstadt.informatik.hostage.ui.fragment;
 
 import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;

src/de/tudarmstadt/informatik/hostage/ui/model/LogFilter.java

@@ -1,4 +1,4 @@
-package de.tudarmstadt.informatik.hostage.ui2.model;
+package de.tudarmstadt.informatik.hostage.ui.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;

src/de/tudarmstadt/informatik/hostage/ui/model/ServicesListItem.java

@@ -1,4 +1,4 @@
-package de.tudarmstadt.informatik.hostage.ui2.model;
+package de.tudarmstadt.informatik.hostage.ui.model;
 
 /**
  * @author Daniel Lazar