diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-03-15 23:00:45 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-03-15 23:02:58 +0100 |
| commit | 14478076cd9ab465f2dc6fdaef93c0167b398d54 (patch) | |
| tree | 66617b2877c395ff89ae9fb761eb1cfa12140fee /main/src/cgeo/geocaching/CgeoApplication.java | |
| parent | 84c8a7f3a1214d1bf9875f0140f9e1ee4e6e26d2 (diff) | |
| download | cgeo-14478076cd9ab465f2dc6fdaef93c0167b398d54.zip cgeo-14478076cd9ab465f2dc6fdaef93c0167b398d54.tar.gz cgeo-14478076cd9ab465f2dc6fdaef93c0167b398d54.tar.bz2 | |
refactoring: moveDatabase belongs to DataStore
Diffstat (limited to 'main/src/cgeo/geocaching/CgeoApplication.java')
| -rw-r--r-- | main/src/cgeo/geocaching/CgeoApplication.java | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/main/src/cgeo/geocaching/CgeoApplication.java b/main/src/cgeo/geocaching/CgeoApplication.java index bb74b52..ef224ff 100644 --- a/main/src/cgeo/geocaching/CgeoApplication.java +++ b/main/src/cgeo/geocaching/CgeoApplication.java @@ -3,19 +3,13 @@ package cgeo.geocaching; import cgeo.geocaching.sensors.DirectionProvider; import cgeo.geocaching.sensors.GeoDataProvider; import cgeo.geocaching.sensors.IGeoData; -import cgeo.geocaching.ui.dialog.Dialogs; import cgeo.geocaching.utils.Log; import org.apache.commons.lang3.tuple.ImmutablePair; import rx.Observable; import rx.functions.Func2; -import android.app.Activity; import android.app.Application; -import android.app.ProgressDialog; -import android.content.res.Resources; - -import java.util.concurrent.atomic.AtomicBoolean; public class CgeoApplication extends Application { @@ -43,33 +37,6 @@ public class CgeoApplication extends Application { DataStore.removeAllFromCache(); } - /** - * Move the database to/from external cgdata in a new thread, - * showing a progress window - * - * @param fromActivity - */ - public void moveDatabase(final Activity fromActivity) { - final Resources res = this.getResources(); - final ProgressDialog dialog = ProgressDialog.show(fromActivity, res.getString(R.string.init_dbmove_dbmove), res.getString(R.string.init_dbmove_running), true, false); - final AtomicBoolean atomic = new AtomicBoolean(false); - new Thread() { - @Override - public void run() { - atomic.set(DataStore.moveDatabase()); - fromActivity.runOnUiThread(new Runnable() { - @Override - public void run() { - dialog.dismiss(); - boolean success = atomic.get(); - String message = success ? res.getString(R.string.init_dbmove_success) : res.getString(R.string.init_dbmove_failed); - Dialogs.message(fromActivity, R.string.init_dbmove_dbmove, message); - } - }); - } - }.start(); - } - public synchronized Observable<ImmutablePair<IGeoData, Float>> geoDirObservable() { if (geoDir == null) { geoDir = Observable.combineLatest(GeoDataProvider.create(this), DirectionProvider.create(this), new Func2<IGeoData, Float, ImmutablePair<IGeoData, Float>>() { |
