diff options
7 files changed, 390 insertions, 287 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java index 065a9dcb..e2e67459 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java @@ -2,21 +2,24 @@ package org.fox.ttrss; import static org.fox.ttrss.ApiCommon.ApiError; -import android.annotation.SuppressLint; import android.content.Context; -import android.os.AsyncTask; +import android.os.Handler; +import android.os.Looper; import com.google.gson.JsonElement; import java.util.HashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; -public class ApiRequest extends AsyncTask<HashMap<String, String>, Integer, JsonElement> implements ApiCommon.ApiCaller { +public class ApiRequest implements ApiCommon.ApiCaller { - protected int m_apiStatusCode = 0; + private static final ExecutorService EXECUTOR = Executors.newSingleThreadExecutor(); + private final Handler m_mainHandler = new Handler(Looper.getMainLooper()); - private final Context m_context; + protected final Context m_context; + protected int m_apiStatusCode = 0; protected String m_lastErrorMessage; - protected ApiError m_lastError; public ApiRequest(Context context) { @@ -24,19 +27,44 @@ public class ApiRequest extends AsyncTask<HashMap<String, String>, Integer, Json m_lastError = ApiError.UNKNOWN_ERROR; } - @SuppressLint("NewApi") - @SuppressWarnings("unchecked") - public void execute(HashMap<String, String> map) { - super.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, map); + /** + * Callback interface for API request completion. + * Both onSuccess and onError are invoked on the main thread before onApiFinished(). + */ + public interface ApiCallback { + void onSuccess(JsonElement result); + void onError(ApiError error, String message, int statusCode); } - public int getErrorMessage() { - return ApiCommon.getErrorMessage(m_lastError); + /** + * Execute the API request with a callback for the result. + * Called on the main thread; work is dispatched to a background executor. + * Callback is invoked on the main thread upon completion. + */ + public void execute(HashMap<String, String> map, ApiCallback callback) { + EXECUTOR.execute(() -> { + JsonElement result = ApiCommon.performRequest(m_context, map, this); + m_mainHandler.post(() -> { + if (result != null && m_lastError == ApiError.SUCCESS) { + callback.onSuccess(result); + + onApiFinished(result); + } else { + callback.onError(m_lastError, m_lastErrorMessage, m_apiStatusCode); + } + }); + }); } - @Override - protected JsonElement doInBackground(HashMap<String, String>... params) { - return ApiCommon.performRequest(m_context, params[0], this); + /** + * Hook for subclasses to handle the result on the main thread. + * Override this instead of onPostExecute. Called only on success. + * For error handling, use the ApiCallback.onError() method. + * + * This is invoked after ApiCallback onSuccess(). + */ + protected void onApiFinished(JsonElement result) { + // no-op by default } @Override @@ -56,7 +84,8 @@ public class ApiRequest extends AsyncTask<HashMap<String, String>, Integer, Json @Override public void notifyProgress(int progress) { - publishProgress(progress); + // Progress is no longer tracked via AsyncTask's publishProgress. + // Subclasses can override if they need progress notifications. } @Override diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java index 48104a1a..505310b6 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java @@ -149,7 +149,19 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList map.put("user", m_prefs.getString("login", "").trim()); map.put("password", m_prefs.getString("password", "").trim()); - lr.execute(map); + lr.execute(map, new ApiRequest.ApiCallback() { + @Override + public void onSuccess(JsonElement result) { + // Handled by LoginRequest.onApiFinished + } + + @Override + public void onError(ApiCommon.ApiError error, String message, int statusCode) { + setSessionId(null); + setLoadingStatus(getString(ApiCommon.getErrorMessage(error)) + "\n\n" + message); + loginFailure(); + } + }); } FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); @@ -455,18 +467,26 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList } public void unsubscribeFeed(final Feed feed) { - ApiRequest req = new ApiRequest(getApplicationContext()) { - protected void onPostExecute(JsonElement result) { - refresh(); - } - }; - HashMap<String, String> map = new HashMap<>(); map.put("sid", getSessionId()); map.put("op", "unsubscribeFeed"); map.put("feed_id", String.valueOf(feed.id)); - req.execute(map); + new ApiRequest(getApplicationContext()) { + @Override + protected void onApiFinished(JsonElement result) { + refresh(); + } + }.execute(map, new ApiRequest.ApiCallback() { + @Override + public void onSuccess(JsonElement result) { + // Handled by onApiFinished + } + @Override + public void onError(ApiCommon.ApiError error, String message, int statusCode) { + toast(getString(ApiCommon.getErrorMessage(error)) + "\n" + message); + } + }); } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index adb6d28a..45875ec6 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -252,7 +252,19 @@ public class OnlineActivity extends CommonActivity { map.put("user", m_prefs.getString("login", "").trim()); map.put("password", m_prefs.getString("password", "").trim()); - ar.execute(map); + ar.execute(map, new ApiRequest.ApiCallback() { + @Override + public void onSuccess(JsonElement result) { + // Handled by LoginRequest.onApiFinished + } + + @Override + public void onError(ApiCommon.ApiError error, String message, int statusCode) { + setSessionId(null); + setLoadingStatus(getString(ApiCommon.getErrorMessage(error)) + "\n\n" + message); + loginFailure(); + } + }); setLoadingStatus(R.string.login_in_progress); } @@ -682,43 +694,50 @@ public class OnlineActivity extends CommonActivity { ApiRequest req = new ApiRequest(getApplicationContext()) { @Override - protected void onPostExecute(JsonElement result) { - if (result != null) { - Type listType = new TypeToken<List<Label>>() { - }.getType(); - final List<Label> labels = new Gson().fromJson(result, listType); - - CharSequence[] items = new CharSequence[labels.size()]; - final int[] itemIds = new int[labels.size()]; - boolean[] checkedItems = new boolean[labels.size()]; - - for (int i = 0; i < labels.size(); i++) { - items[i] = labels.get(i).caption; - itemIds[i] = labels.get(i).id; - checkedItems[i] = labels.get(i).checked; - } - - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(OnlineActivity.this) - .setTitle(R.string.article_set_labels) - .setMultiChoiceItems(items, checkedItems, (dialog, which, isChecked) -> { - final int labelId = itemIds[which]; - - HashMap<String, String> map = new HashMap<>(); - map.put("sid", getSessionId()); - map.put("op", "setArticleLabel"); - map.put("label_id", String.valueOf(labelId)); - map.put("article_ids", String.valueOf(articleId)); - if (isChecked) map.put("assign", "true"); + protected void onApiFinished(JsonElement result) { + Type listType = new TypeToken<List<Label>>() { + }.getType(); + final List<Label> labels = new Gson().fromJson(result, listType); + + CharSequence[] items = new CharSequence[labels.size()]; + final int[] itemIds = new int[labels.size()]; + boolean[] checkedItems = new boolean[labels.size()]; + + for (int i = 0; i < labels.size(); i++) { + items[i] = labels.get(i).caption; + itemIds[i] = labels.get(i).id; + checkedItems[i] = labels.get(i).checked; + } - ApiRequest req1 = new ApiRequest(OnlineActivity.this); - req1.execute(map); + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(OnlineActivity.this) + .setTitle(R.string.article_set_labels) + .setMultiChoiceItems(items, checkedItems, (dialog, which, isChecked) -> { + final int labelId = itemIds[which]; + + HashMap<String, String> map = new HashMap<>(); + map.put("sid", getSessionId()); + map.put("op", "setArticleLabel"); + map.put("label_id", String.valueOf(labelId)); + map.put("article_ids", String.valueOf(articleId)); + if (isChecked) map.put("assign", "true"); + + ApiRequest req1 = new ApiRequest(OnlineActivity.this); + req1.execute(map, new ApiRequest.ApiCallback() { + @Override + public void onSuccess(JsonElement result) { + // no-op, dialog auto-dismisses + } - }).setPositiveButton(R.string.dialog_close, (dialog, which) -> dialog.cancel()); + @Override + public void onError(ApiCommon.ApiError error, String message, int statusCode) { + toast(getString(ApiCommon.getErrorMessage(error)) + "\n" + message); + } + }); - Dialog dialog = builder.create(); - dialog.show(); + }).setPositiveButton(R.string.dialog_close, (dialog, which) -> dialog.cancel()); - } + Dialog dialog = builder.create(); + dialog.show(); } }; @@ -727,14 +746,24 @@ public class OnlineActivity extends CommonActivity { map.put("op", "getLabels"); map.put("article_id", String.valueOf(articleId)); - req.execute(map); + req.execute(map, new ApiRequest.ApiCallback() { + @Override + public void onSuccess(JsonElement result) { + // Handled by LoginRequest.onApiFinished + } + + @Override + public void onError(ApiCommon.ApiError error, String message, int statusCode) { + toast(getString(ApiCommon.getErrorMessage(error)) + "\n" + message); + } + }); } - private void setLoadingStatus(int status) { + protected void setLoadingStatus(int status) { setLoadingStatus(getString(status)); } - private void setLoadingStatus(String status) { + protected void setLoadingStatus(String status) { TextView tv = findViewById(R.id.loading_message); if (tv != null) { @@ -910,13 +939,6 @@ public class OnlineActivity extends CommonActivity { public void catchupFeed(final Feed feed, final String mode, final boolean refreshAfter, final String searchQuery) { Log.d(TAG, "catchupFeed=" + feed + "; mode=" + mode + "; search=" + searchQuery); - ApiRequest req = new ApiRequest(getApplicationContext()) { - protected void onPostExecute(JsonElement result) { - if (refreshAfter) - refresh(); - } - }; - HashMap<String, String> map = new HashMap<>(); map.put("sid", getSessionId()); map.put("op", "catchupFeed"); @@ -927,7 +949,23 @@ public class OnlineActivity extends CommonActivity { if (feed.is_cat) map.put("is_cat", "1"); - req.execute(map); + new ApiRequest(getApplicationContext()) { + @Override + protected void onApiFinished(JsonElement result) { + if (refreshAfter) + refresh(); + } + }.execute(map, new ApiRequest.ApiCallback() { + @Override + public void onSuccess(JsonElement result) { + // Handled by onApiFinished + } + + @Override + public void onError(ApiCommon.ApiError error, String message, int statusCode) { + toast(getString(ApiCommon.getErrorMessage(error)) + "\n" + message); + } + }); } public void saveArticleUnread(final Article article) { @@ -978,102 +1016,104 @@ public class OnlineActivity extends CommonActivity { } public void setArticlesField(final List<Article> articles, int field, int mode) { - ApiRequest req = new ApiRequest(getApplicationContext()) { - protected void onPostExecute(JsonElement result) { - if (m_lastError == ApiCommon.ApiError.SUCCESS) { + HashMap<String, String> map = new HashMap<>(); + map.put("sid", getSessionId()); + map.put("op", "updateArticle"); + map.put("article_ids", articles.stream() + .map(a -> String.valueOf(a.id)) + .collect(Collectors.joining(","))); + map.put("mode", String.valueOf(mode)); - if (BuildConfig.DEBUG) - Log.d(TAG, "setArticleField operation complete, field=" + field + " mode=" + mode); + if (field == Article.UPDATE_FIELD_NOTE) + map.put("data", articles.get(0).note); - ArticleModel model = Application.getArticlesModel(); + if (field == Article.UPDATE_FIELD_SCORE) + map.put("data", String.valueOf(articles.get(0).score)); - for (Article a : articles) { - Article articleClone = new Article(a); + map.put("field", String.valueOf(field)); - switch (mode) { - case Article.UPDATE_SET_FALSE: - switch (field) { - case Article.UPDATE_FIELD_MARKED: - articleClone.marked = false; - break; - case Article.UPDATE_FIELD_PUBLISHED: - articleClone.published = false; - break; - case Article.UPDATE_FIELD_UNREAD: - articleClone.unread = false; - break; - } - break; - case Article.UPDATE_SET_TRUE: - switch (field) { - case Article.UPDATE_FIELD_MARKED: - articleClone.marked = true; - break; - case Article.UPDATE_FIELD_PUBLISHED: - articleClone.published = true; - break; - case Article.UPDATE_FIELD_UNREAD: - articleClone.unread = true; - break; - } - break; - case Article.UPDATE_TOGGLE: - switch (field) { - case Article.UPDATE_FIELD_MARKED: - articleClone.marked = !articleClone.marked; - break; - case Article.UPDATE_FIELD_PUBLISHED: - articleClone.published = !articleClone.published; - break; - case Article.UPDATE_FIELD_UNREAD: - articleClone.unread = !articleClone.unread; - break; - } - break; - } + new ApiRequest(getApplicationContext()) { + @Override + protected void onApiFinished(JsonElement result) { + + if (BuildConfig.DEBUG) + Log.d(TAG, "setArticleField operation complete, field=" + field + " mode=" + mode); + ArticleModel model = Application.getArticlesModel(); - if (BuildConfig.DEBUG) - Log.d(TAG, "updating article: " + articleClone); + for (Article a : articles) { + Article articleClone = new Article(a); - model.update(articleClone); + switch (mode) { + case Article.UPDATE_SET_FALSE: + switch (field) { + case Article.UPDATE_FIELD_MARKED: + articleClone.marked = false; + break; + case Article.UPDATE_FIELD_PUBLISHED: + articleClone.published = false; + break; + case Article.UPDATE_FIELD_UNREAD: + articleClone.unread = false; + break; + } + break; + case Article.UPDATE_SET_TRUE: + switch (field) { + case Article.UPDATE_FIELD_MARKED: + articleClone.marked = true; + break; + case Article.UPDATE_FIELD_PUBLISHED: + articleClone.published = true; + break; + case Article.UPDATE_FIELD_UNREAD: + articleClone.unread = true; + break; + } + break; + case Article.UPDATE_TOGGLE: + switch (field) { + case Article.UPDATE_FIELD_MARKED: + articleClone.marked = !articleClone.marked; + break; + case Article.UPDATE_FIELD_PUBLISHED: + articleClone.published = !articleClone.published; + break; + case Article.UPDATE_FIELD_UNREAD: + articleClone.unread = !articleClone.unread; + break; + } + break; } - invalidateOptionsMenu(); - return; + if (BuildConfig.DEBUG) + Log.d(TAG, "updating article: " + articleClone); + + model.update(articleClone); } - if (m_lastError != null && m_lastError == ApiCommon.ApiError.LOGIN_FAILED) { + invalidateOptionsMenu(); + } + }.execute(map, new ApiRequest.ApiCallback() { + @Override + public void onSuccess(JsonElement result) { + // Handled by onApiFinished + } + + @Override + public void onError(ApiCommon.ApiError error, String message, int statusCode) { + if (error == ApiCommon.ApiError.LOGIN_FAILED) { login(true); } else { - if (m_lastErrorMessage != null) { - toast(getString(getErrorMessage()) + "\n" + m_lastErrorMessage); + if (message != null) { + toast(getString(ApiCommon.getErrorMessage(error)) + "\n" + message); } else { - toast(getErrorMessage()); + toast(ApiCommon.getErrorMessage(error)); } } } - }; - - HashMap<String, String> map = new HashMap<>(); - map.put("sid", getSessionId()); - map.put("op", "updateArticle"); - map.put("article_ids", articles.stream() - .map(a -> String.valueOf(a.id)) - .collect(Collectors.joining(","))); - map.put("mode", String.valueOf(mode)); - - if (field == Article.UPDATE_FIELD_NOTE) - map.put("data", articles.get(0).note); - - if (field == Article.UPDATE_FIELD_SCORE) - map.put("data", String.valueOf(articles.get(0).score)); - - map.put("field", String.valueOf(field)); - - req.execute(map); - + }); } // this may be called after activity has been destroyed (i.e. long asynctask) @@ -1163,65 +1203,57 @@ public class OnlineActivity extends CommonActivity { } @SuppressLint("StaticFieldLeak") - protected void onPostExecute(JsonElement result) { - if (result != null) { - try { - JsonObject content = result.getAsJsonObject(); - - if (content != null) { - setSessionId(content.get("session_id").getAsString()); + @Override + protected void onApiFinished(JsonElement result) { + try { + JsonObject content = result.getAsJsonObject(); - JsonElement apiLevel = content.get("api_level"); + if (content != null) { + setSessionId(content.get("session_id").getAsString()); - Log.d(TAG, "Authenticated!"); + JsonElement apiLevel = content.get("api_level"); - if (apiLevel != null) { - setApiLevel(apiLevel.getAsInt()); - } else { - // Very old tt-rss server without api_level in login response - setApiLevel(0); - } + Log.d(TAG, "Authenticated!"); - Log.d(TAG, "Received API level: " + getApiLevel()); + if (apiLevel != null) { + setApiLevel(apiLevel.getAsInt()); + } else { + // Very old tt-rss server without api_level in login response + setApiLevel(0); + } - // get custom sort from configuration object - if (getApiLevel() >= 17) { + Log.d(TAG, "Received API level: " + getApiLevel()); - // daemon_is_running, icons_dir, etc... - JsonObject config = content.get("config").getAsJsonObject(); + // get custom sort from configuration object + if (getApiLevel() >= 17) { - Type hashType = new TypeToken<Map<String, String>>() { - }.getType(); - Map<String, String> customSortTypes = new Gson().fromJson(config.get("custom_sort_types"), hashType); + // daemon_is_running, icons_dir, etc... + JsonObject config = content.get("config").getAsJsonObject(); - setCustomSortModes(customSortTypes); - } + Type hashType = new TypeToken<Map<String, String>>() { + }.getType(); + Map<String, String> customSortTypes = new Gson().fromJson(config.get("custom_sort_types"), hashType); - if (m_listener != null) { - m_listener.OnLoginSuccess(); - } else { - loginSuccess(m_refreshAfterLogin); - } + setCustomSortModes(customSortTypes); + } - return; + if (m_listener != null) { + m_listener.OnLoginSuccess(); + } else { + loginSuccess(m_refreshAfterLogin); } - } catch (Exception e) { - e.printStackTrace(); + return; } - } - - setSessionId(null); - if (m_lastErrorMessage != null) { - setLoadingStatus(getString(getErrorMessage()) + "\n\n" + m_lastErrorMessage); - } else { - setLoadingStatus(getString(getErrorMessage()) + "\n\n" + m_apiStatusCode); + } catch (Exception e) { + e.printStackTrace(); } + setSessionId(null); + setLoadingStatus(getString(ApiCommon.getErrorMessage(m_lastError)) + "\n\n" + m_lastErrorMessage); loginFailure(); } - } public LinkedHashMap<String, String> getSortModes() { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java index 6df7c226..fbc042e2 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java @@ -13,6 +13,7 @@ import androidx.preference.PreferenceManager; import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import org.fox.ttrss.ApiCommon; import org.fox.ttrss.ApiRequest; import org.fox.ttrss.PreferencesActivity; import org.fox.ttrss.R; @@ -83,7 +84,7 @@ public abstract class CommonShareActivity extends CommonActivity { @Override protected void onLoginFailed(int requestId, ApiRequest ar) { - toast(ar.getErrorMessage()); + toast(ApiCommon.getErrorMessage(ar.getLastError())); setProgressBarIndeterminateVisibility(false); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java index f5b01947..2e1e0f90 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java @@ -82,21 +82,6 @@ public class ShareActivity extends CommonShareActivity { private void postData() { m_button.setEnabled(false); - ApiRequest req = new ApiRequest(getApplicationContext()) { - protected void onPostExecute(JsonElement result) { - setProgressBarIndeterminateVisibility(false); - - if (m_lastError != ApiCommon.ApiError.UNKNOWN_ERROR) { - toast(getErrorMessage()); - } else { - toast(R.string.share_article_posted); - finish(); - } - - m_button.setEnabled(true); - } - }; - final EditText url = (EditText) findViewById(R.id.url); final EditText title = (EditText) findViewById(R.id.title); final EditText content = (EditText) findViewById(R.id.content); @@ -111,7 +96,26 @@ public class ShareActivity extends CommonShareActivity { setProgressBarIndeterminateVisibility(true); - req.execute(map); + new ApiRequest(getApplicationContext()) { + @Override + protected void onApiFinished(JsonElement result) { + setProgressBarIndeterminateVisibility(false); + toast(R.string.share_article_posted); + finish(); + } + }.execute(map, new ApiRequest.ApiCallback() { + @Override + public void onSuccess(JsonElement result) { + // Handled by onApiFinished + } + + @Override + public void onError(ApiCommon.ApiError error, String message, int statusCode) { + setProgressBarIndeterminateVisibility(false); + toast(ApiCommon.getErrorMessage(error)); + m_button.setEnabled(true); + } + }); } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java index fdc5915d..4d90809a 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java @@ -144,13 +144,28 @@ public class SubscribeActivity extends CommonShareActivity { private void subscribeToFeed() { m_postButton.setEnabled(false); - @SuppressLint("StaticFieldLeak") ApiRequest req = new ApiRequest(getApplicationContext()) { - protected void onPostExecute(JsonElement result) { - m_progressBar.setVisibility(View.INVISIBLE); + Spinner catSpinner = findViewById(R.id.category_spinner); + + final Feed cat = m_catAdapter.getCategory(catSpinner.getSelectedItemPosition()); + final EditText feedUrl = findViewById(R.id.feed_url); + + if (feedUrl != null) { + HashMap<String, String> map = new HashMap<>(); + map.put("sid", m_sessionId); + map.put("op", "subscribeToFeed"); + map.put("feed_url", feedUrl.getText().toString()); + + if (cat != null) { + map.put("category_id", String.valueOf(cat.id)); + } + + m_progressBar.setVisibility(View.VISIBLE); + + new ApiRequest(getApplicationContext()) { + @Override + protected void onApiFinished(JsonElement result) { + m_progressBar.setVisibility(View.INVISIBLE); - if (m_lastError != null && m_lastError != ApiCommon.ApiError.SUCCESS) { - toast(getErrorMessage()); - } else { try { int rc = -1; @@ -163,11 +178,9 @@ public class SubscribeActivity extends CommonShareActivity { switch (rc) { case -1: toast(R.string.error_api_unknown); - //finish(); break; case 0: toast(R.string.error_feed_already_exists_); - //finish(); break; case 1: toast(R.string.subscribed_to_feed); @@ -180,8 +193,6 @@ public class SubscribeActivity extends CommonShareActivity { toast(R.string.error_url_is_an_html_page_no_feeds_found); break; case 4: - //toast(R.string.error_url_contains_multiple_feeds); - JsonObject feeds = result.getAsJsonObject().get("status").getAsJsonObject().get("feeds").getAsJsonObject(); if (feeds != null) { @@ -205,30 +216,22 @@ public class SubscribeActivity extends CommonShareActivity { } catch (Exception e) { toast(e.getMessage()); } - } - - m_postButton.setEnabled(true); - } - }; - - Spinner catSpinner = findViewById(R.id.category_spinner); - - final Feed cat = m_catAdapter.getCategory(catSpinner.getSelectedItemPosition()); - final EditText feedUrl = findViewById(R.id.feed_url); - if (feedUrl != null) { - HashMap<String, String> map = new HashMap<>(); - map.put("sid", m_sessionId); - map.put("op", "subscribeToFeed"); - map.put("feed_url", feedUrl.getText().toString()); - - if (cat != null) { - map.put("category_id", String.valueOf(cat.id)); - } - - m_progressBar.setVisibility(View.VISIBLE); + m_postButton.setEnabled(true); + } + }.execute(map, new ApiRequest.ApiCallback() { + @Override + public void onSuccess(JsonElement result) { + // Handled by onApiFinished + } - req.execute(map); + @Override + public void onError(ApiCommon.ApiError error, String message, int statusCode) { + m_progressBar.setVisibility(View.INVISIBLE); + toast(ApiCommon.getErrorMessage(error)); + m_postButton.setEnabled(true); + } + }); } } @@ -245,44 +248,51 @@ public class SubscribeActivity extends CommonShareActivity { } private void updateCats() { - @SuppressLint("StaticFieldLeak") ApiRequest req = new ApiRequest(getApplicationContext()) { - protected void onPostExecute(JsonElement result) { + HashMap<String, String> map = new HashMap<>(); + map.put("sid", m_sessionId); + map.put("op", "getCategories"); + + m_progressBar.setVisibility(View.VISIBLE); + + new ApiRequest(getApplicationContext()) { + @Override + protected void onApiFinished(JsonElement result) { m_progressBar.setVisibility(View.INVISIBLE); - if (m_lastError != null && m_lastError != ApiCommon.ApiError.SUCCESS) { - toast(getErrorMessage()); - } else { - JsonArray content = result.getAsJsonArray(); + JsonArray content = result.getAsJsonArray(); - if (content != null) { - Type listType = new TypeToken<List<Feed>>() { - }.getType(); - final List<Feed> catsJson = new Gson().fromJson(content, listType); + if (content != null) { + Type listType = new TypeToken<List<Feed>>() { + }.getType(); + final List<Feed> catsJson = new Gson().fromJson(content, listType); - m_cats.clear(); - m_cats.addAll(catsJson.stream().filter(f -> f.id > 0).collect(Collectors.toList())); + m_cats.clear(); + m_cats.addAll(catsJson.stream().filter(f -> f.id > 0).collect(Collectors.toList())); - sortCats(); + sortCats(); - m_cats.add(0, new Feed(0, "Uncategorized", true)); + m_cats.add(0, new Feed(0, "Uncategorized", true)); - m_catAdapter.notifyDataSetChanged(); + m_catAdapter.notifyDataSetChanged(); - toast(R.string.category_list_updated); - } + toast(R.string.category_list_updated); } m_catButton.setEnabled(true); } - }; - - HashMap<String, String> map = new HashMap<>(); - map.put("sid", m_sessionId); - map.put("op", "getCategories"); - - m_progressBar.setVisibility(View.VISIBLE); + }.execute(map, new ApiRequest.ApiCallback() { + @Override + public void onSuccess(JsonElement result) { + // Handled by onApiFinished + } - req.execute(map); + @Override + public void onError(ApiCommon.ApiError error, String message, int statusCode) { + m_progressBar.setVisibility(View.INVISIBLE); + toast(ApiCommon.getErrorMessage(error)); + m_catButton.setEnabled(true); + } + }); } @Override diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java index f29a7745..9693a9b6 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java @@ -6,6 +6,7 @@ import android.util.Log; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import org.fox.ttrss.ApiCommon; import org.fox.ttrss.ApiRequest; import java.util.HashMap; @@ -23,40 +24,35 @@ public abstract class SimpleLoginManager { m_requestId = requestId; } - protected void onPostExecute(JsonElement result) { - Log.d(TAG, "onPostExecute"); + @Override + protected void onApiFinished(JsonElement result) { + Log.d(TAG, "onApiFinished"); - if (result != null) { - try { - JsonObject content = result.getAsJsonObject(); - if (content != null) { - m_sessionId = content.get("session_id").getAsString(); + try { + JsonObject content = result.getAsJsonObject(); + if (content != null) { + m_sessionId = content.get("session_id").getAsString(); - // Extract api_level from login response directly - // (works for both v1 and v2 login responses) - JsonElement apiLevelEl = content.get("api_level"); - if (apiLevelEl != null) { - m_apiLevel = apiLevelEl.getAsInt(); - } else { - m_apiLevel = 0; - } - - Log.d(TAG, "[SLM] Authenticated! api_level=" + m_apiLevel); - - onLoginSuccess(m_requestId, m_sessionId, m_apiLevel); - return; + JsonElement apiLevelEl = content.get("api_level"); + if (apiLevelEl != null) { + m_apiLevel = apiLevelEl.getAsInt(); + } else { + m_apiLevel = 0; } - } catch (Exception e) { - e.printStackTrace(); + Log.d(TAG, "[SLM] Authenticated! api_level=" + m_apiLevel); + + onLoginSuccess(m_requestId, m_sessionId, m_apiLevel); + return; } + + } catch (Exception e) { + e.printStackTrace(); } m_sessionId = null; - onLoginFailed(m_requestId, this); } - } public void logIn(Context context, int requestId, final String login, final String password) { @@ -69,7 +65,18 @@ public abstract class SimpleLoginManager { onLoggingIn(requestId); - ar.execute(map); + ar.execute(map, new ApiRequest.ApiCallback() { + @Override + public void onSuccess(JsonElement result) { + // Handled by LoginRequest.onApiFinished + } + + @Override + public void onError(ApiCommon.ApiError error, String message, int statusCode) { + ar.m_sessionId = null; + onLoginFailed(requestId, ar); + } + }); } protected abstract void onLoggingIn(int requestId); |
