aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2012-04-20 20:03:10 +0200
committerSamuel Tardieu <sam@rfc1149.net>2012-04-20 20:07:37 +0200
commit52ad919d60df5d884e585c21b7e8ac9194504ebc (patch)
tree97bc90404126ffe0c21d21f5edd502f5f1f5363e
parentc3b85698801e7cc54f896b28f33ac80c66da024d (diff)
downloadcgeo-52ad919d60df5d884e585c21b7e8ac9194504ebc.zip
cgeo-52ad919d60df5d884e585c21b7e8ac9194504ebc.tar.gz
cgeo-52ad919d60df5d884e585c21b7e8ac9194504ebc.tar.bz2
Refactoring: no need to use a AtomicReference
-rw-r--r--main/src/cgeo/geocaching/cgeoinit.java33
1 files changed, 12 insertions, 21 deletions
diff --git a/main/src/cgeo/geocaching/cgeoinit.java b/main/src/cgeo/geocaching/cgeoinit.java
index ee83f2d..a5c7854 100644
--- a/main/src/cgeo/geocaching/cgeoinit.java
+++ b/main/src/cgeo/geocaching/cgeoinit.java
@@ -48,7 +48,6 @@ import android.widget.TextView;
import java.io.File;
import java.util.Collection;
import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
public class cgeoinit extends AbstractActivity {
@@ -704,30 +703,22 @@ public class cgeoinit extends AbstractActivity {
return;
}
- final AtomicReference<String> fileRef = new AtomicReference<String>(null);
final ProgressDialog dialog = ProgressDialog.show(this, res.getString(R.string.init_backup), res.getString(R.string.init_backup_running), true, false);
- Thread backupThread = new Thread() {
- final Handler handler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- dialog.dismiss();
- final String file = fileRef.get();
- if (file != null) {
- helpDialog(res.getString(R.string.init_backup_backup), res.getString(R.string.init_backup_success) + "\n" + file);
- } else {
- helpDialog(res.getString(R.string.init_backup_backup), res.getString(R.string.init_backup_failed));
- }
- refreshBackupLabel();
- }
- };
-
+ new Thread() {
@Override
public void run() {
- fileRef.set(app.backupDatabase());
- handler.sendMessage(handler.obtainMessage());
+ final String backupFileName = app.backupDatabase();
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ dialog.dismiss();
+ helpDialog(res.getString(R.string.init_backup_backup),
+ backupFileName != null ? res.getString(R.string.init_backup_success) + "\n" + backupFileName : res.getString(R.string.init_backup_failed));
+ refreshBackupLabel();
+ }
+ });
}
- };
- backupThread.start();
+ }.start();
}
private void refreshBackupLabel() {