diff --git a/app/src/main/java/lu/circl/mispbump/activities/HomeActivity.java b/app/src/main/java/lu/circl/mispbump/activities/HomeActivity.java
index 57e34a9..96b5827 100644
--- a/app/src/main/java/lu/circl/mispbump/activities/HomeActivity.java
+++ b/app/src/main/java/lu/circl/mispbump/activities/HomeActivity.java
@@ -43,6 +43,29 @@ public class HomeActivity extends AppCompatActivity {
Intent detailActivity = new Intent(HomeActivity.this, SyncInfoDetailActivity.class);
detailActivity.putExtra(SyncInfoDetailActivity.EXTRA_SYNC_INFO_UUID, syncInformationList.get(index).getUuid());
startActivity(detailActivity);
+
+// SyncInformation syncInfo = preferenceManager.getSyncInformation(syncInformationList.get(index).getUuid());
+//
+// View dialogContent = getLayoutInflater().inflate(R.layout.dialog_credentials, null);
+//
+// MaterialPreferenceText url = dialogContent.findViewById(R.id.url);
+// url.setSubtitle(syncInfo.getRemote().getServer().getUrl());
+//
+// MaterialPreferenceText email = dialogContent.findViewById(R.id.email);
+// email.setSubtitle(syncInfo.getLocal().getSyncUser().getEmail());
+//
+// MaterialPasswordView authkey = dialogContent.findViewById(R.id.authkey);
+// authkey.setPassword(syncInfo.getLocal().getSyncUser().getAuthkey());
+//
+// MaterialPasswordView password = dialogContent.findViewById(R.id.password);
+// password.setPassword(syncInfo.getLocal().getSyncUser().getPassword());
+//
+// new MaterialAlertDialogBuilder(HomeActivity.this)
+// .setTitle("Credentials")
+// .setMessage("These credentials are valid for the sync user on your partners MISP instance")
+// .setView(dialogContent)
+// .setPositiveButton(android.R.string.ok, null)
+// .show();
};
@Override
diff --git a/app/src/main/java/lu/circl/mispbump/activities/SyncInfoDetailActivity.java b/app/src/main/java/lu/circl/mispbump/activities/SyncInfoDetailActivity.java
index d95d69f..bf42147 100644
--- a/app/src/main/java/lu/circl/mispbump/activities/SyncInfoDetailActivity.java
+++ b/app/src/main/java/lu/circl/mispbump/activities/SyncInfoDetailActivity.java
@@ -12,6 +12,7 @@ import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import java.util.UUID;
@@ -66,12 +67,22 @@ public class SyncInfoDetailActivity extends AppCompatActivity {
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
- // preferenceManager.removeUploadInformation(syncUUID);
if (item.getItemId() == android.R.id.home) {
onBackPressed();
return true;
- } else return item.getItemId() == R.id.menu_delete_sync;
+ } else if (item.getItemId() == R.id.menu_delete_sync) {
+ new MaterialAlertDialogBuilder(SyncInfoDetailActivity.this)
+ .setTitle("Delete Sync Locally")
+ .setMessage("This will not remove the information from your MISP instance.")
+ .setPositiveButton("Remove", (dialog, which) -> {
+ preferenceManager.removeUploadInformation(syncUUID);
+ })
+ .setNegativeButton("Discard", null)
+ .show();
+ return true;
+ }
+ return false;
}
@Override
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 712727b..438a083 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -39,8 +39,6 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
- app:backgroundTint="@color/colorAccent"
- android:tint="@color/white"
android:src="@drawable/ic_qrcode_scan"/>
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index 054fa6a..236cc0d 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -134,8 +134,6 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
- android:backgroundTint="@color/colorAccent"
- android:src="@drawable/ic_sync_black_24dp"
- android:tint="@color/white"/>
+ android:src="@drawable/ic_sync_black_24dp" />
diff --git a/app/src/main/res/layout/activity_sync_info_detail.xml b/app/src/main/res/layout/activity_sync_info_detail.xml
index 4a347f4..b9550ef 100644
--- a/app/src/main/res/layout/activity_sync_info_detail.xml
+++ b/app/src/main/res/layout/activity_sync_info_detail.xml
@@ -175,7 +175,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_cloud_upload"
- android:tint="@color/white"
android:layout_margin="16dp"
android:layout_gravity="bottom|end" />
diff --git a/app/src/main/res/layout/dialog_credentials.xml b/app/src/main/res/layout/dialog_credentials.xml
new file mode 100644
index 0000000..7debcfc
--- /dev/null
+++ b/app/src/main/res/layout/dialog_credentials.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/menu/menu_sync_detail.xml b/app/src/main/res/menu/menu_sync_detail.xml
index 29333ef..68a3a06 100644
--- a/app/src/main/res/menu/menu_sync_detail.xml
+++ b/app/src/main/res/menu/menu_sync_detail.xml
@@ -4,6 +4,6 @@
+ android:title="@string/label_delete_sync" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index fa4e0ad..9622e72 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,6 +2,10 @@
#047EB4
#066796
+
+ #047EB4
+ #FFF
+
#12B3FA
#FFFFFF
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 536e85b..a57ff77 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -57,4 +57,5 @@
Information
Upload Changes
Download Changes
+ Delete Synchronisation
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e15b812..a301ef7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,6 +3,10 @@