From 112a9e88a74d2cd5fa8e8c301fe97f96850cbdcc Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Sun, 9 Jun 2019 17:08:25 +0200
Subject: [PATCH] Fix an issue for news

---
 .../java/app/fedilab/android/client/API.java  | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/client/API.java b/app/src/main/java/app/fedilab/android/client/API.java
index 894b41930..4f37cd441 100644
--- a/app/src/main/java/app/fedilab/android/client/API.java
+++ b/app/src/main/java/app/fedilab/android/client/API.java
@@ -1536,6 +1536,7 @@ public class API {
             params.put("max_id", max_id);
 
         params.put("exclude_replies", "true");
+        params.put("reblogs","false");
         params.put("limit", "40");
         params.put("tagged", "Fedilab");
         statuses = new ArrayList<>();
@@ -1545,13 +1546,31 @@ public class API {
 
         String accountID = sharedpreferences.getString(Helper.NEWS_ACCOUNT_ID+userId+instance, null);
         if( accountID == null){
-            APIResponse response = search("https://framapiaf.org/@fedilab");
-            Results res = response.getResults();
-            if( res != null && res.getAccounts() != null && res.getAccounts().size() > 0 ){
-                accountID = res.getAccounts().get(0).getId();
-                SharedPreferences.Editor editor = sharedpreferences.edit();
-                editor.putString(Helper.NEWS_ACCOUNT_ID+userId+instance, accountID);
-                editor.apply();
+            try {
+                params.put("q", URLEncoder.encode("https://framapiaf.org/@fedilab", "UTF-8"));
+            } catch (UnsupportedEncodingException e) {
+                params.put("q", "https://framapiaf.org/@fedilab");
+            }
+            HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
+            try {
+                String response = httpsConnection.get(getAbsoluteUrl("/search"), 60, params, prefKeyOauthTokenT);
+                Results res = parseResultsResponse(new JSONObject(response));
+                if( res != null && res.getAccounts() != null && res.getAccounts().size() > 0 ){
+                    accountID = res.getAccounts().get(0).getId();
+                    SharedPreferences.Editor editor = sharedpreferences.edit();
+                    editor.putString(Helper.NEWS_ACCOUNT_ID+userId+instance, accountID);
+                    editor.apply();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            } catch (NoSuchAlgorithmException e) {
+                e.printStackTrace();
+            } catch (KeyManagementException e) {
+                e.printStackTrace();
+            } catch (HttpsConnection.HttpsConnectionException e) {
+                e.printStackTrace();
+            } catch (JSONException e) {
+                e.printStackTrace();
             }
         }
         try {