Refactor BaseTask interface

pull/77/merge
Alinson S. Xavier 10 years ago
parent 1cd8eb6849
commit 7433a2413d

@ -198,10 +198,9 @@ public class ViewTest extends BaseTest
new BaseTask() new BaseTask()
{ {
@Override @Override
protected Void doInBackground(Void... params) protected void doInBackground()
{ {
view.refreshData(); view.refreshData();
return null;
} }
}.execute(); }.execute();

@ -72,11 +72,9 @@ public class HistoryEditorDialog extends DialogFragment
new BaseTask() new BaseTask()
{ {
@Override @Override
@SuppressWarnings("ResourceType") protected void doInBackground()
protected Void doInBackground(Void... params)
{ {
historyView.refreshData(); historyView.refreshData();
return null;
} }
}.execute(); }.execute();
} }

@ -23,24 +23,27 @@ import android.os.AsyncTask;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
public class BaseTask extends AsyncTask<Void, Void, Void> public abstract class BaseTask extends AsyncTask<Void, Void, Void>
{ {
private static int activeTaskCount; private static int activeTaskCount;
@Override @Override
protected Void doInBackground(Void... params) protected final Void doInBackground(Void... params)
{ {
register();
doInBackground();
unregister();
return null; return null;
} }
@Override protected abstract void doInBackground();
protected void onPreExecute()
protected void register()
{ {
activeTaskCount++; activeTaskCount++;
} }
@Override protected void unregister()
protected void onPostExecute(Void aVoid)
{ {
activeTaskCount--; activeTaskCount--;
} }

@ -19,7 +19,6 @@
package org.isoron.uhabits.tasks; package org.isoron.uhabits.tasks;
import android.os.AsyncTask;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.view.View; import android.view.View;
import android.widget.ProgressBar; import android.widget.ProgressBar;
@ -80,12 +79,12 @@ public class ExportCSVTask extends BaseTask
} }
@Override @Override
protected Void doInBackground(Void... params) protected void doInBackground()
{ {
try try
{ {
File dir = DatabaseHelper.getFilesDir("CSV"); File dir = DatabaseHelper.getFilesDir("CSV");
if(dir == null) return null; if(dir == null) return;
HabitsCSVExporter exporter = new HabitsCSVExporter(selectedHabits, dir); HabitsCSVExporter exporter = new HabitsCSVExporter(selectedHabits, dir);
archiveFilename = exporter.writeArchive(); archiveFilename = exporter.writeArchive();
@ -94,7 +93,5 @@ public class ExportCSVTask extends BaseTask
{ {
e.printStackTrace(); e.printStackTrace();
} }
return null;
} }
} }

@ -19,7 +19,6 @@
package org.isoron.uhabits.tasks; package org.isoron.uhabits.tasks;
import android.os.AsyncTask;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.view.View; import android.view.View;
import android.widget.ProgressBar; import android.widget.ProgressBar;
@ -75,14 +74,14 @@ public class ExportDBTask extends BaseTask
} }
@Override @Override
protected Void doInBackground(Void... params) protected void doInBackground()
{ {
filename = null; filename = null;
try try
{ {
File dir = DatabaseHelper.getFilesDir("Backups"); File dir = DatabaseHelper.getFilesDir("Backups");
if(dir == null) return null; if(dir == null) return;
filename = DatabaseHelper.saveDatabaseCopy(dir); filename = DatabaseHelper.saveDatabaseCopy(dir);
} }
@ -90,7 +89,5 @@ public class ExportDBTask extends BaseTask
{ {
e.printStackTrace(); e.printStackTrace();
} }
return null;
} }
} }

@ -19,7 +19,6 @@
package org.isoron.uhabits.tasks; package org.isoron.uhabits.tasks;
import android.os.AsyncTask;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.view.View; import android.view.View;
@ -86,7 +85,7 @@ public class ImportDataTask extends BaseTask
} }
@Override @Override
protected Void doInBackground(Void... params) protected void doInBackground()
{ {
try try
{ {
@ -106,7 +105,5 @@ public class ImportDataTask extends BaseTask
result = FAILED; result = FAILED;
e.printStackTrace(); e.printStackTrace();
} }
return null;
} }
} }

@ -38,10 +38,9 @@ public class ToggleRepetitionTask extends BaseTask
} }
@Override @Override
protected Void doInBackground(Void... params) protected void doInBackground()
{ {
habit.repetitions.toggle(timestamp); habit.repetitions.toggle(timestamp);
return null;
} }
@Override @Override

@ -388,13 +388,12 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
@Override @Override
public void onToggleRepetitionFinished() public void onToggleRepetitionFinished()
{ {
new BaseTask() { new BaseTask()
{
@Override @Override
@SuppressWarnings("ResourceType") protected void doInBackground()
protected Void doInBackground(Void... params)
{ {
refreshData(); refreshData();
return null;
} }
@Override @Override

@ -223,10 +223,9 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider
} }
@Override @Override
protected Void doInBackground(Void... params) protected void doInBackground()
{ {
refreshCustomViewData(widgetView); refreshCustomViewData(widgetView);
return null;
} }
@Override @Override

Loading…
Cancel
Save