Browse Source

refreshes the record overview after synchronization

Alexander Brakowski 9 years ago
parent
commit
4557027777

+ 1 - 1
src/de/tudarmstadt/informatik/hostage/logging/SyncRecord.java

@@ -341,7 +341,7 @@ public class SyncRecord implements Parcelable, Serializable {
                 ", externalIP='" + externalIP + '\'' +
                 ", wasInternalAttack=" + wasInternalAttack +
                 ", attackRecord=" + attackRecord +
-                //", messageRecords=" + messageRecords +
+                ", messageRecords=" + messageRecords +
                 ", number_of_attacks=" + number_of_attacks +
                 ", number_of_portscans=" + number_of_portscans +
                 '}';

+ 18 - 1
src/de/tudarmstadt/informatik/hostage/sync/bluetooth/BluetoothSyncActivity.java

@@ -244,7 +244,16 @@ public class BluetoothSyncActivity extends Activity{
 			serverThread.cancel();
 		}
 	}
-	
+
+    protected void setResultIntent(int result, boolean doFinish){
+        Intent intent = new Intent();
+        intent.putExtra("result", result);
+
+        setResult(result, intent);
+
+        if(doFinish) finish();
+    }
+
 	/**
 	 * Handles message sent from the background threads and updates UI.
 	 */
@@ -269,15 +278,23 @@ public class BluetoothSyncActivity extends Activity{
         		case CONNECTION_FAILED: 
         			mInfoText.setText("Failed to connect to device!");
                     progressBar.setVisibility(View.GONE);
+
+                    BluetoothSyncActivity.this.setResultIntent(SYNC_SUCCESSFUL, false);
+
         			break;
         		case SYNC_SUCCESSFUL: 
         			mInfoText.setText("Synchronization successful!");
                     progressBar.setVisibility(View.GONE);
+
+                    BluetoothSyncActivity.this.setResultIntent(SYNC_SUCCESSFUL, true);
+
                     break;
         		case SYNC_FAILED: 
         			commThread.cancel();
         			mInfoText.setText("Synchronization failed!");
                     progressBar.setVisibility(View.GONE);
+
+                    BluetoothSyncActivity.this.setResultIntent(SYNC_FAILED, false);
                     break;
         	}        		
         }

+ 0 - 11
src/de/tudarmstadt/informatik/hostage/sync/bluetooth/CommunicationThread.java

@@ -102,28 +102,17 @@ public class CommunicationThread extends Thread {
                 mHandler.obtainMessage(BluetoothSyncActivity.SYNC_START).sendToTarget();
                 SyncInfo thisSyncInfo = synchronizer.getSyncInfo();
 
-                System.out.println("----------------------- Sent: " + Arrays.toString(thisSyncInfo.bssids.toArray()));
                 write(new SyncMessage(SyncMessage.SYNC_RESPONSE_INFO, thisSyncInfo));
 				break;			
 			case SyncMessage.SYNC_RESPONSE_INFO:
                 SyncInfo otherSyncInfo = (SyncInfo) message.getPayload();
 
-                System.out.println("----------------------- Received: " + Arrays.toString(otherSyncInfo.bssids.toArray()));
-                System.out.println("----------------------- Received: " + otherSyncInfo.deviceMap.toString());
-
                 SyncData thisSyncData = synchronizer.getSyncData(otherSyncInfo);
                 write(new SyncMessage(SyncMessage.SYNC_RESPONSE_DATA, thisSyncData));
 
-                System.out.println("----------------------- Sent: " + thisSyncData.syncRecords.toString());
-                System.out.println("----------------------- Sent: " + thisSyncData.networkRecords.toString());
-
 				break;
             case SyncMessage.SYNC_RESPONSE_DATA:
                 SyncData otherData = (SyncData) message.getPayload();
-
-                System.out.println("----------------------- Received: " + otherData.syncRecords.toString());
-                System.out.println("----------------------- Received: " + otherData.networkRecords.toString());
-
                 synchronizer.updateFromSyncData(otherData);
 
                 mHandler.obtainMessage(BluetoothSyncActivity.SYNC_SUCCESSFUL).sendToTarget();

+ 14 - 2
src/de/tudarmstadt/informatik/hostage/ui/fragment/RecordOverviewFragment.java

@@ -384,7 +384,8 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
 					public void onClick(DialogInterface dialog, int position) {
 						switch(position){
 							case 0:
-								getActivity().startActivity(new Intent(getActivity(), BluetoothSyncActivity.class));
+
+								startActivityForResult(new Intent(getBaseContext(), BluetoothSyncActivity.class), 0);
 								break;
 							case 1:
 								getActivity().startActivity(new Intent(getActivity(), NFCSyncActivity.class));
@@ -427,7 +428,18 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
 		return false;
 	}
 
-	/*****************************
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if(requestCode == 0){
+            if(resultCode == BluetoothSyncActivity.SYNC_SUCCESSFUL){
+                actualiseListViewInBackground();
+            }
+        }
+    }
+
+    /*****************************
 	 *
 	 * 			Public API
 	 *