From 783a99ab9f4d6d91d46f8f0101ac16da0683f201 Mon Sep 17 00:00:00 2001 From: Daniel Schaal Date: Fri, 25 Sep 2015 16:47:03 +0200 Subject: Move TaskId constants to AsyncTask_* classes --- .../owncloudnewsreader/NewsReaderListActivity.java | 4 +-- .../reader/owncloud/AsyncTask_GetApiVersion.java | 5 ++-- .../reader/owncloud/AsyncTask_GetFeeds.java | 5 ++-- .../reader/owncloud/AsyncTask_GetFolderTags.java | 5 ++-- .../reader/owncloud/AsyncTask_GetItems.java | 4 +-- .../reader/owncloud/AsyncTask_GetOldItems.java | 5 ++-- .../owncloud/AsyncTask_PerformItemStateChange.java | 5 ++-- .../reader/owncloud/OwnCloud_Reader.java | 30 +++++++++------------- .../services/OwnCloudSyncService.java | 12 ++++----- .../services/SyncItemStateService.java | 4 +-- 10 files changed, 39 insertions(+), 40 deletions(-) (limited to 'News-Android-App/src/main') diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java index e304984e..7278d41b 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java @@ -793,7 +793,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements if(username != null) { _Reader = new OwnCloud_Reader(); - _Reader.Start_AsyncTask_GetVersion(Constants.TaskID_GetVersion, this, onAsyncTaskGetVersionFinished); + _Reader.Start_AsyncTask_GetVersion(this, onAsyncTaskGetVersionFinished); Toast.makeText(this, getString(R.string.toast_GettingMoreItems), Toast.LENGTH_SHORT).show(); } @@ -809,7 +809,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements _Reader.setApi(api); NewsReaderDetailFragment ndf = getNewsReaderDetailFragment(); - _Reader.Start_AsyncTask_GetOldItems(Constants.TaskID_GetItems, NewsReaderListActivity.this, onAsyncTaskComplete, ndf.getIdFeed(), ndf.getIdFolder()); + _Reader.Start_AsyncTask_GetOldItems(NewsReaderListActivity.this, onAsyncTaskComplete, ndf.getIdFeed(), ndf.getIdFolder()); } } }; diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetApiVersion.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetApiVersion.java index f201636a..103506b9 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetApiVersion.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetApiVersion.java @@ -25,13 +25,14 @@ import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; +import de.luhmer.owncloudnewsreader.Constants; import de.luhmer.owncloudnewsreader.SettingsActivity; import de.luhmer.owncloudnewsreader.reader.AsyncTask_Reader; import de.luhmer.owncloudnewsreader.reader.OnAsyncTaskCompletedListener; public class AsyncTask_GetApiVersion extends AsyncTask_Reader { - public AsyncTask_GetApiVersion(final int task_id, final Context context, final OnAsyncTaskCompletedListener[] listener) { - super(task_id, context, listener); + public AsyncTask_GetApiVersion(final Context context, final OnAsyncTaskCompletedListener[] listener) { + super(Constants.TaskID_GetVersion, context, listener); } @Override diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetFeeds.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetFeeds.java index 23b2642b..8d92fc5e 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetFeeds.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetFeeds.java @@ -23,6 +23,7 @@ package de.luhmer.owncloudnewsreader.reader.owncloud; import android.content.Context; +import de.luhmer.owncloudnewsreader.Constants; import de.luhmer.owncloudnewsreader.reader.AsyncTask_Reader; import de.luhmer.owncloudnewsreader.reader.OnAsyncTaskCompletedListener; @@ -30,8 +31,8 @@ public class AsyncTask_GetFeeds extends AsyncTask_Reader { private API api; - public AsyncTask_GetFeeds(final int task_id, final Context context, final OnAsyncTaskCompletedListener[] listener, API api) { - super(task_id, context, listener); + public AsyncTask_GetFeeds(final Context context, final OnAsyncTaskCompletedListener[] listener, API api) { + super(Constants.TaskID_GetFeeds, context, listener); this.api = api; } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetFolderTags.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetFolderTags.java index 4e92316e..42b7201f 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetFolderTags.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetFolderTags.java @@ -23,6 +23,7 @@ package de.luhmer.owncloudnewsreader.reader.owncloud; import android.content.Context; +import de.luhmer.owncloudnewsreader.Constants; import de.luhmer.owncloudnewsreader.reader.AsyncTask_Reader; import de.luhmer.owncloudnewsreader.reader.OnAsyncTaskCompletedListener; @@ -30,8 +31,8 @@ public class AsyncTask_GetFolderTags extends AsyncTask_Reader { private API api; - public AsyncTask_GetFolderTags(final int task_id, final Context context, final OnAsyncTaskCompletedListener[] listener, API api) { - super(task_id, context, listener); + public AsyncTask_GetFolderTags(final Context context, final OnAsyncTaskCompletedListener[] listener, API api) { + super(Constants.TaskID_GetFolder, context, listener); this.api = api; } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetItems.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetItems.java index 8a1f41d0..4cbaf5ac 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetItems.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetItems.java @@ -49,8 +49,8 @@ public class AsyncTask_GetItems extends AsyncTask_Reader { private API api; int totalCount; - public AsyncTask_GetItems(final int task_id, final Context context, final OnAsyncTaskCompletedListener[] listener, API api) { - super(task_id, context, listener); + public AsyncTask_GetItems(final Context context, final OnAsyncTaskCompletedListener[] listener, API api) { + super(Constants.TaskID_GetItems, context, listener); this.api = api; totalCount = 0; diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetOldItems.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetOldItems.java index 7a812ebb..2cfa8b72 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetOldItems.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_GetOldItems.java @@ -24,6 +24,7 @@ package de.luhmer.owncloudnewsreader.reader.owncloud; import android.content.Context; import android.widget.Toast; +import de.luhmer.owncloudnewsreader.Constants; import de.luhmer.owncloudnewsreader.ListView.SubscriptionExpandableListAdapter; import de.luhmer.owncloudnewsreader.NewsReaderDetailFragment; import de.luhmer.owncloudnewsreader.NewsReaderListActivity; @@ -42,8 +43,8 @@ public class AsyncTask_GetOldItems extends AsyncTask_Reader { private int downloadedItemsCount = 0; private API api; - public AsyncTask_GetOldItems(final int task_id, final Context context, final OnAsyncTaskCompletedListener[] listener, Long feed_id, Long folder_id, API api) { - super(task_id, context, listener); + public AsyncTask_GetOldItems(final Context context, final OnAsyncTaskCompletedListener[] listener, Long feed_id, Long folder_id, API api) { + super(Constants.TaskID_GetItems, context, listener); this.feed_id = feed_id; this.folder_id = folder_id; diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_PerformItemStateChange.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_PerformItemStateChange.java index efb39753..c499aaef 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_PerformItemStateChange.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/AsyncTask_PerformItemStateChange.java @@ -26,6 +26,7 @@ import android.content.Context; import java.util.ArrayList; import java.util.List; +import de.luhmer.owncloudnewsreader.Constants; import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm; import de.luhmer.owncloudnewsreader.reader.AsyncTask_Reader; import de.luhmer.owncloudnewsreader.reader.FeedItemTags; @@ -35,8 +36,8 @@ public class AsyncTask_PerformItemStateChange extends AsyncTask_Reader { private API api; - public AsyncTask_PerformItemStateChange(final int task_id, final Context context, final OnAsyncTaskCompletedListener[] listener, API api) { - super(task_id, context, listener); + public AsyncTask_PerformItemStateChange(final Context context, final OnAsyncTaskCompletedListener[] listener, API api) { + super(Constants.TaskID_PerformStateChange, context, listener); this.api = api; } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/OwnCloud_Reader.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/OwnCloud_Reader.java index ce5937dc..747f859b 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/OwnCloud_Reader.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/owncloud/OwnCloud_Reader.java @@ -36,41 +36,35 @@ public class OwnCloud_Reader { public OwnCloud_Reader() { } - public void Start_AsyncTask_GetItems(int task_id, - Context context, OnAsyncTaskCompletedListener listener, FeedItemTags tag) { + public void Start_AsyncTask_GetItems(Context context, OnAsyncTaskCompletedListener listener, FeedItemTags tag) { setSyncRunning(true); - new AsyncTask_GetItems(task_id, context, new OnAsyncTaskCompletedListener[] { AsyncTask_finished, listener }, api).execute(tag); + new AsyncTask_GetItems(context, new OnAsyncTaskCompletedListener[] { AsyncTask_finished, listener }, api).execute(tag); } - public void Start_AsyncTask_GetOldItems(int task_id, - Context context, OnAsyncTaskCompletedListener listener, Long feed_id, Long folder_id) { + public void Start_AsyncTask_GetOldItems(Context context, OnAsyncTaskCompletedListener listener, Long feed_id, Long folder_id) { setSyncRunning(true); - new AsyncTask_GetOldItems(task_id, context, new OnAsyncTaskCompletedListener[] { AsyncTask_finished, listener }, feed_id, folder_id, api).execute(); + new AsyncTask_GetOldItems(context, new OnAsyncTaskCompletedListener[] { AsyncTask_finished, listener }, feed_id, folder_id, api).execute(); } - public void Start_AsyncTask_GetFolder(int task_id, - Context context, OnAsyncTaskCompletedListener listener) { + public void Start_AsyncTask_GetFolder(Context context, OnAsyncTaskCompletedListener listener) { setSyncRunning(true); - new AsyncTask_GetFolderTags(task_id, context, new OnAsyncTaskCompletedListener[] { AsyncTask_finished, listener }, api).execute(); + new AsyncTask_GetFolderTags(context, new OnAsyncTaskCompletedListener[] { AsyncTask_finished, listener }, api).execute(); } - public void Start_AsyncTask_GetFeeds(int task_id, - Context context, OnAsyncTaskCompletedListener listener) { + public void Start_AsyncTask_GetFeeds(Context context, OnAsyncTaskCompletedListener listener) { setSyncRunning(true); - new AsyncTask_GetFeeds(task_id, context, new OnAsyncTaskCompletedListener[] { AsyncTask_finished, listener }, api).execute(); + new AsyncTask_GetFeeds(context, new OnAsyncTaskCompletedListener[] { AsyncTask_finished, listener }, api).execute(); } - public void Start_AsyncTask_PerformItemStateChange(int task_id, - Context context, OnAsyncTaskCompletedListener listener) { + public void Start_AsyncTask_PerformItemStateChange(Context context, OnAsyncTaskCompletedListener listener) { setSyncRunning(true); - new AsyncTask_PerformItemStateChange(task_id, context, new OnAsyncTaskCompletedListener[] { AsyncTask_finished, listener }, api).execute(); + new AsyncTask_PerformItemStateChange(context, new OnAsyncTaskCompletedListener[] { AsyncTask_finished, listener }, api).execute(); } - public void Start_AsyncTask_GetVersion(int task_id, - Context context, OnAsyncTaskCompletedListener listener) { + public void Start_AsyncTask_GetVersion(Context context, OnAsyncTaskCompletedListener listener) { setSyncRunning(true); - new AsyncTask_GetApiVersion(task_id, context, new OnAsyncTaskCompletedListener[] { AsyncTask_finished, listener }).execute(); + new AsyncTask_GetApiVersion(context, new OnAsyncTaskCompletedListener[] { AsyncTask_finished, listener }).execute(); } public boolean isSyncRunning() { diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/OwnCloudSyncService.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/OwnCloudSyncService.java index 8d8ff53d..59c2e4f0 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/OwnCloudSyncService.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/OwnCloudSyncService.java @@ -73,10 +73,10 @@ public class OwnCloudSyncService extends Service { if(!isSyncRunning()) { // Only check for API version once if(_Reader.getApi() == null) { - _Reader.Start_AsyncTask_GetVersion(Constants.TaskID_GetVersion, OwnCloudSyncService.this, onAsyncTask_GetVersionFinished); + _Reader.Start_AsyncTask_GetVersion(OwnCloudSyncService.this, onAsyncTask_GetVersionFinished); startedSync(SYNC_TYPES.SYNC_TYPE__GET_API); } else { - _Reader.Start_AsyncTask_PerformItemStateChange(Constants.TaskID_PerformStateChange, OwnCloudSyncService.this, onAsyncTask_PerformTagExecute); + _Reader.Start_AsyncTask_PerformItemStateChange(OwnCloudSyncService.this, onAsyncTask_PerformTagExecute); startedSync(SYNC_TYPES.SYNC_TYPE__ITEM_STATES); } } @@ -123,7 +123,7 @@ public class OwnCloudSyncService extends Service { API api = API.GetRightApiForVersion(appVersion, OwnCloudSyncService.this); _Reader.setApi(api); - _Reader.Start_AsyncTask_PerformItemStateChange(Constants.TaskID_PerformStateChange, OwnCloudSyncService.this, onAsyncTask_PerformTagExecute); + _Reader.Start_AsyncTask_PerformItemStateChange(OwnCloudSyncService.this, onAsyncTask_PerformTagExecute); startedSync(SYNC_TYPES.SYNC_TYPE__ITEM_STATES); } @@ -144,7 +144,7 @@ public class OwnCloudSyncService extends Service { if((Boolean) task_result) { if(task_id == Constants.TaskID_PerformStateChange) { - _Reader.Start_AsyncTask_GetFolder(Constants.TaskID_GetFolder, OwnCloudSyncService.this, onAsyncTask_GetFolder); + _Reader.Start_AsyncTask_GetFolder(OwnCloudSyncService.this, onAsyncTask_GetFolder); startedSync(SYNC_TYPES.SYNC_TYPE__FOLDER); @@ -166,7 +166,7 @@ public class OwnCloudSyncService extends Service { if(task_result != null) ThrowException((Exception) task_result); else { - _Reader.Start_AsyncTask_GetFeeds(Constants.TaskID_GetFeeds, OwnCloudSyncService.this, onAsyncTask_GetFeed); + _Reader.Start_AsyncTask_GetFeeds(OwnCloudSyncService.this, onAsyncTask_GetFeed); startedSync(SYNC_TYPES.SYNC_TYPE__FEEDS); } @@ -186,7 +186,7 @@ public class OwnCloudSyncService extends Service { if(task_result != null) ThrowException((Exception) task_result); else { - _Reader.Start_AsyncTask_GetItems(Constants.TaskID_GetItems, OwnCloudSyncService.this, onAsyncTask_GetItems, FeedItemTags.ALL);//Recieve all unread Items + _Reader.Start_AsyncTask_GetItems(OwnCloudSyncService.this, onAsyncTask_GetItems, FeedItemTags.ALL);//Recieve all unread Items startedSync(SYNC_TYPES.SYNC_TYPE__ITEMS); } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/SyncItemStateService.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/SyncItemStateService.java index fc68f4ef..7ffb3f7e 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/SyncItemStateService.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/SyncItemStateService.java @@ -49,7 +49,7 @@ public class SyncItemStateService extends IntentService { @Override protected void onHandleIntent(Intent intent) { - _Reader.Start_AsyncTask_GetVersion(Constants.TaskID_GetVersion, this, onAsyncTask_GetVersionFinished); + _Reader.Start_AsyncTask_GetVersion(this, onAsyncTask_GetVersionFinished); } OnAsyncTaskCompletedListener onAsyncTask_GetVersionFinished = new OnAsyncTaskCompletedListener() { @@ -64,7 +64,7 @@ public class SyncItemStateService extends IntentService { _Reader.setApi(api); - _Reader.Start_AsyncTask_PerformItemStateChange(Constants.TaskID_PerformStateChange, SyncItemStateService.this, null); + _Reader.Start_AsyncTask_PerformItemStateChange(SyncItemStateService.this, null); } } }; -- cgit v1.2.3