From 3a9444c6027704d09954371697af7cc4cdf9172d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 31 Oct 2014 01:07:56 +0300 Subject: enable generic error reporting through toasts for the time being remove some unused stuff --- .../java/org/fox/ttrss/FeedCategoriesFragment.java | 1 + .../src/main/java/org/fox/ttrss/FeedsFragment.java | 1 + .../main/java/org/fox/ttrss/HeadlinesFragment.java | 136 +-------------------- .../java/org/fox/ttrss/util/HeadlinesRequest.java | 1 + 4 files changed, 4 insertions(+), 135 deletions(-) (limited to 'org.fox.ttrss') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java index 613af835..f6b45343 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java @@ -376,6 +376,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe if (m_lastError == ApiError.LOGIN_FAILED) { m_activity.login(true); } else { + m_activity.toast(getErrorMessage()); //m_activity.setLoadingStatus(getErrorMessage(), false); } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index c0e80452..d5e1aab4 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -561,6 +561,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh if (m_lastError == ApiError.LOGIN_FAILED) { m_activity.login(true); } else { + m_activity.toast(getErrorMessage()); //m_activity.setLoadingStatus(getErrorMessage(), false); } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 31a96f6d..927f7b2b 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -485,6 +485,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (m_lastError == ApiError.LOGIN_FAILED) { m_activity.login(true); } else { + m_activity.toast(getErrorMessage()); //m_activity.setLoadingStatus(getErrorMessage(), false); } } @@ -579,84 +580,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, out.putCharSequence("searchQuery", m_searchQuery); } - /* private void setLoadingStatus(int status, boolean showProgress) { - if (getView() != null) { - TextView tv = (TextView)getView().findViewById(R.id.loading_message); - - if (tv != null) { - tv.setText(status); - } - } - - if (getActivity() != null) - getActivity().setProgressBarIndeterminateVisibility(showProgress); - } */ - - /* private class HeadlinesRequest extends ApiRequest { - int m_offset = 0; - - public HeadlinesRequest(Context context) { - super(context); - } - - protected void onPostExecute(JsonElement result) { - if (result != null) { - try { - JsonArray content = result.getAsJsonArray(); - if (content != null) { - Type listType = new TypeToken>() {}.getType(); - final List
articles = new Gson().fromJson(content, listType); - - while (m_articles.size() > HEADLINES_BUFFER_MAX) - m_articles.remove(0); - - if (m_offset == 0) - m_articles.clear(); - else - m_articles.remove(m_articles.size()-1); // remove previous placeholder - - for (Article f : articles) - m_articles.add(f); - - if (articles.size() == HEADLINES_REQUEST_SIZE) { - Article placeholder = new Article(-1); - m_articles.add(placeholder); - - m_canLoadMore = true; - } else { - m_canLoadMore = false; - } - - m_adapter.notifyDataSetChanged(); - - if (m_articles.size() == 0) - setLoadingStatus(R.string.no_headlines_to_display, false); - else - setLoadingStatus(R.string.blank, false); - - m_refreshInProgress = false; - - return; - } - - } catch (Exception e) { - e.printStackTrace(); - } - } - - if (m_lastError == ApiError.LOGIN_FAILED) { - m_activity.login(); - } else { - setLoadingStatus(getErrorMessage(), false); - } - m_refreshInProgress = false; - } - - public void setOffset(int skip) { - m_offset = skip; - } - } */ - static class HeadlineViewHolder { public TextView titleView; public TextView feedTitleView; @@ -1178,61 +1101,4 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, public Feed getFeed() { return m_feed; } - - /* class DownloadFlavorImagesTask extends AsyncTask { - ImageView imageView = null; - @Override - protected Bitmap doInBackground(ImageView... imageViews) { - this.imageView = imageViews[0]; - return download((URL)imageView.getTag()); - } - - @Override - protected void onPostExecute(Bitmap result) { - if (result != null) { - imageView.setImageBitmap(result); - imageView.setVisibility(View.VISIBLE); - } - } - - private Bitmap download(URL url) { - try { - HttpURLConnection conn = (HttpURLConnection) url.openConnection(); - - conn.setDoInput(true); - conn.setUseCaches(true); - conn.connect(); - - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - - byte[] buf = new byte[256]; - int read = 0; - - while ((read = conn.getInputStream().read(buf)) >= 0) { - bos.write(buf, 0, read); - } - - final BitmapFactory.Options options = new BitmapFactory.Options(); - - byte[] bitmap = bos.toByteArray(); - - options.inJustDecodeBounds = true; - BitmapFactory.decodeByteArray(bitmap, 0, bitmap.length, options); - options.inJustDecodeBounds = false; - - int inSampleSize = CommonActivity.calculateInSampleSize(options, 128, 128); - - Bitmap decodedBitmap = BitmapFactory.decodeByteArray(bitmap, 0, bitmap.length, options); - - return decodedBitmap; - } catch (OutOfMemoryError e) { - Log.d(TAG, "OOM while trying to decode headline flavor image. :("); - e.printStackTrace(); - } catch (IOException e) { - // - } - - return null; - } - } */ } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesRequest.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesRequest.java index b16176e1..d209a55d 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesRequest.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesRequest.java @@ -90,6 +90,7 @@ public class HeadlinesRequest extends ApiRequest { if (m_lastError == ApiError.LOGIN_FAILED) { m_activity.login(); } else { + m_activity.toast(getErrorMessage()); //m_activity.setLoadingStatus(getErrorMessage(), false); } } -- cgit v1.2.3