diff options
author | Samuel Tardieu <sam@rfc1149.net> | 2014-12-12 11:05:46 +0100 |
---|---|---|
committer | Samuel Tardieu <sam@rfc1149.net> | 2014-12-12 11:05:46 +0100 |
commit | 83918aa7c4b6e2f7159bfe053918e7d3151c55c3 (patch) | |
tree | 2b36842edf8ed385871bd0c18d83fdbdaee7dacd | |
parent | d33b8f5b369c0f854ad4dd29af9856e218087980 (diff) | |
parent | 7e9452692ce1523361f3390118487a17c5d1da73 (diff) | |
download | cgeo-83918aa7c4b6e2f7159bfe053918e7d3151c55c3.zip cgeo-83918aa7c4b6e2f7159bfe053918e7d3151c55c3.tar.gz cgeo-83918aa7c4b6e2f7159bfe053918e7d3151c55c3.tar.bz2 |
Merge branch 'release' into upstream
-rw-r--r-- | main/src/cgeo/geocaching/CachePopupFragment.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/CachePopupFragment.java b/main/src/cgeo/geocaching/CachePopupFragment.java index d1a69a7..ff4348a 100644 --- a/main/src/cgeo/geocaching/CachePopupFragment.java +++ b/main/src/cgeo/geocaching/CachePopupFragment.java @@ -22,6 +22,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.support.v4.app.DialogFragment; +import android.support.v4.app.FragmentActivity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -141,12 +142,17 @@ public class CachePopupFragment extends AbstractDialogFragment { protected void storeCache(final int listId) { final StoreCacheHandler storeCacheHandler = new StoreCacheHandler(R.string.cache_dialog_offline_save_message); - progress.show(getActivity(), res.getString(R.string.cache_dialog_offline_save_title), res.getString(R.string.cache_dialog_offline_save_message), true, storeCacheHandler.cancelMessage()); - Schedulers.io().createWorker().schedule(new Action0() { + final FragmentActivity activity = getActivity(); + progress.show(activity, res.getString(R.string.cache_dialog_offline_save_title), res.getString(R.string.cache_dialog_offline_save_message), true, storeCacheHandler.cancelMessage()); + RxUtils.andThenOnUi(Schedulers.io(), new Action0() { @Override public void call() { cache.store(listId, storeCacheHandler); - getActivity().supportInvalidateOptionsMenu(); + } + }, new Action0() { + @Override + public void call() { + activity.supportInvalidateOptionsMenu(); } }); } |