iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improve error reporting a bit

Browse Source
This commit is contained in:
Andrew Dolgov 2015-08-17 23:42:07 +03:00
parent c28adf42b3
commit 4ec76ca88d
6 changed files with 99 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java
View File

@ -51,6 +51,7 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
protected boolean m_canUseProgress = false;
protected Context m_context;
private SharedPreferences m_prefs;
protected String m_lastErrorMessage;
protected ApiError m_lastError;
@ -257,9 +258,11 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
return null;
} catch (javax.net.ssl.SSLPeerUnverifiedException e) {
m_lastError = ApiError.SSL_REJECTED;
m_lastErrorMessage = e.getMessage();
e.printStackTrace();
} catch (IOException e) {
m_lastError = ApiError.IO_ERROR;
m_lastErrorMessage = e.getMessage();
if (e.getMessage() != null) {
if (e.getMessage().matches("Hostname [^ ]+ was not verified")) {
@ -270,9 +273,11 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
e.printStackTrace();
} catch (com.google.gson.JsonSyntaxException e) {
m_lastError = ApiError.PARSE_ERROR;
m_lastErrorMessage = e.getMessage();
e.printStackTrace();
} catch (Exception e) {
m_lastError = ApiError.OTHER_ERROR;
m_lastErrorMessage = e.getMessage();
e.printStackTrace();
}

8
org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
View File

@ -381,7 +381,13 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
if (m_lastError == ApiError.LOGIN_FAILED) {
m_activity.login(true);
} else {
m_activity.toast(getErrorMessage());
if (m_lastErrorMessage != null) {
m_activity.toast(getString(getErrorMessage()) + "\n" + m_lastErrorMessage);
} else {
m_activity.toast(getErrorMessage());
}
//m_activity.setLoadingStatus(getErrorMessage(), false);
}
}

8
org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
View File

@ -570,7 +570,13 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
if (m_lastError == ApiError.LOGIN_FAILED) {
m_activity.login(true);
} else {
m_activity.toast(getErrorMessage());
if (m_lastErrorMessage != null) {
m_activity.toast(getString(getErrorMessage()) + "\n" + m_lastErrorMessage);
} else {
m_activity.toast(getErrorMessage());
}
//m_activity.setLoadingStatus(getErrorMessage(), false);
}
}

8
org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
View File

@ -565,7 +565,13 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
if (m_lastError == ApiError.LOGIN_FAILED) {
m_activity.login(true);
} else {
m_activity.toast(getErrorMessage());
if (m_lastErrorMessage != null) {
m_activity.toast(getString(getErrorMessage()) + "\n" + m_lastErrorMessage);
} else {
m_activity.toast(getErrorMessage());
}
//m_activity.setLoadingStatus(getErrorMessage(), false);
}
}

27
org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
View File

@ -1148,6 +1148,20 @@ public class OnlineActivity extends CommonActivity {
}
}
private void setLoadingStatus(String status, boolean showProgress) {
TextView tv = (TextView) findViewById(R.id.loading_message);
if (tv != null) {
tv.setText(status);
}
View loadingContainer = findViewById(R.id.loading_container);
if (loadingContainer != null) {
loadingContainer.setVisibility(status.equals("") ? View.GONE : View.VISIBLE);
}
}
protected void logout() {
setSessionId(null);
@ -1628,6 +1642,12 @@ public class OnlineActivity extends CommonActivity {
setLoadingStatus(getErrorMessage(), false);
if (m_lastErrorMessage != null) {
setLoadingStatus(getString(getErrorMessage()) + "\n\n" + m_lastErrorMessage, false);
} else {
setLoadingStatus(getErrorMessage(), false);
}
if (m_listener != null) {
m_listener.OnLoginFailed();
} else {
@ -1667,7 +1687,12 @@ public class OnlineActivity extends CommonActivity {
}
setSessionId(null);
setLoadingStatus(getErrorMessage(), false);
if (m_lastErrorMessage != null) {
setLoadingStatus(getString(getErrorMessage()) + "\n\n" + m_lastErrorMessage, false);
} else {
setLoadingStatus(getErrorMessage(), false);
}
loginFailure();
}

7
org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesRequest.java
View File

@ -118,7 +118,12 @@ public class HeadlinesRequest extends ApiRequest {
if (m_lastError == ApiError.LOGIN_FAILED) {
m_activity.login();
} else {
m_activity.toast(getErrorMessage());
if (m_lastErrorMessage != null) {
m_activity.toast(m_activity.getString(getErrorMessage()) + "\n" + m_lastErrorMessage);
} else {
m_activity.toast(getErrorMessage());
}
//m_activity.setLoadingStatus(getErrorMessage(), false);
}
}