From 1ad693931ffec031db499dda27c844c240920160 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 2 Dec 2013 21:55:55 -0500
Subject: [PATCH] if incoming repo Intent is handled, then return to the
 sending Activity

---
 AndroidManifest.xml                   | 5 +++--
 src/org/fdroid/fdroid/ManageRepo.java | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e9e3f1a3a..6040a50d6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -60,10 +60,11 @@
                 android:name="android.app.default_searchable"
                 android:value=".SearchResults" />
         </activity>
-
         <activity
             android:name=".ManageRepo"
+            android:allowTaskReparenting="true"
             android:label="@string/menu_manage"
+            android:launchMode="singleTop"
             android:parentActivityName=".FDroid" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -99,7 +100,7 @@
                 <data android:pathPattern="/.*/.*/fdroid/archive/*" />
                 <data android:pathPattern="/.*/.*/.*/fdroid/archive" />
                 <data android:pathPattern="/.*/.*/.*/fdroid/archive/*" />
-                </intent-filter>
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
diff --git a/src/org/fdroid/fdroid/ManageRepo.java b/src/org/fdroid/fdroid/ManageRepo.java
index ae2047705..de5b6c884 100644
--- a/src/org/fdroid/fdroid/ManageRepo.java
+++ b/src/org/fdroid/fdroid/ManageRepo.java
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
 import android.app.ListActivity;
@@ -287,6 +288,8 @@ public class ManageRepo extends ListActivity {
                 new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
+                        setResult(Activity.RESULT_CANCELED);
+                        finish();
                         return;
                     }
                 });
@@ -351,6 +354,8 @@ public class ManageRepo extends ListActivity {
         }
         changed = true;
         redraw();
+        setResult(Activity.RESULT_OK);
+        finish();
     }
 
     @Override