Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix pin

This commit is contained in:
tom79 2019-12-17 18:45:29 +01:00
parent 957555c40b
commit 3737cdb5ca
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/app/fedilab/android/activities/HashTagActivity.java
View File

@ -186,6 +186,7 @@ public class HashTagActivity extends BaseActivity implements OnRetrieveFeedsInte
SQLiteDatabase db = Sqlite.getInstance(HashTagActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
new SearchDAO(HashTagActivity.this, db).insertSearch(tag);
Intent intent = new Intent(HashTagActivity.this, MainActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
intent.putExtra(Helper.INTENT_ACTION, Helper.SEARCH_TAG);
intent.putExtra(Helper.SEARCH_KEYWORD, tag);
startActivity(intent);

4
app/src/main/java/app/fedilab/android/client/API.java
View File

@ -5166,6 +5166,10 @@ public class API {
List<Filters> filters = null;
try {
String response = new HttpsConnection(context, this.instance).get(getAbsoluteUrl("/filters"), 10, null, prefKeyOauthTokenT);
if (response == null) {
apiResponse.setFilters(new ArrayList<>());
return apiResponse;
}
filters = parseFilters(new JSONArray(response));
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);

9
app/src/main/java/app/fedilab/android/client/HttpsConnection.java
View File

@ -209,6 +209,13 @@ public class HttpsConnection {
int code = httpresponse.code();
String error = httpresponse.message();
if (code >= 200 && code < 400) {
if (!cache.isClosed()) {
try {
cache.close();
} catch (IOException e) {
e.printStackTrace();
}
}
getOKHttpHeader(httpresponse.headers().toMultimap());
return response;
} else {
@ -224,7 +231,7 @@ public class HttpsConnection {
}
}
}
return null;
throw new HttpsConnectionException(500, context.getString(R.string.toast_error));
}else{
if (proxy != null)