Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

if incoming repo Intent is handled, then return to the sending Activity

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2013-12-02 21:55:55 -05:00
parent f9d2fbb0ae
commit 1ad693931f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
AndroidManifest.xml
View File

@ -60,10 +60,11 @@
android:name="android.app.default_searchable" android:name="android.app.default_searchable"
android:value=".SearchResults" /> android:value=".SearchResults" />
</activity> </activity>
<activity <activity
android:name=".ManageRepo" android:name=".ManageRepo"
android:allowTaskReparenting="true"
android:label="@string/menu_manage" android:label="@string/menu_manage"
android:launchMode="singleTop"
android:parentActivityName=".FDroid" > android:parentActivityName=".FDroid" >
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" 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" /> <data android:pathPattern="/.*/.*/.*/fdroid/archive" />
<data android:pathPattern="/.*/.*/.*/fdroid/archive/*" /> <data android:pathPattern="/.*/.*/.*/fdroid/archive/*" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />

5
src/org/fdroid/fdroid/ManageRepo.java
View File

@ -26,6 +26,7 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.AlertDialog.Builder; import android.app.AlertDialog.Builder;
import android.app.ListActivity; import android.app.ListActivity;
@ -287,6 +288,8 @@ public class ManageRepo extends ListActivity {
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
setResult(Activity.RESULT_CANCELED);
finish();
return; return;
} }
}); });
@ -351,6 +354,8 @@ public class ManageRepo extends ListActivity {
} }
changed = true; changed = true;
redraw(); redraw();
setResult(Activity.RESULT_OK);
finish();
} }
@Override @Override