From 337fa7a82ff68aaba26c40ddf08fbaeae17924c8 Mon Sep 17 00:00:00 2001 From: stom79 Date: Sat, 13 Jan 2018 10:41:56 +0100 Subject: [PATCH] Fixes some bugs --- .../java/fr/gouv/etalab/mastodon/client/API.java | 8 +++++++- .../gouv/etalab/mastodon/client/Entities/Status.java | 4 ---- .../mastodon/drawers/AccountsSearchAdapter.java | 12 ++++-------- .../etalab/mastodon/drawers/EmojisSearchAdapter.java | 10 +++------- .../etalab/mastodon/drawers/TagsSearchAdapter.java | 10 +++------- 5 files changed, 17 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java index 321413ed8..4371f00b1 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java @@ -94,6 +94,11 @@ public class API { public API(Context context, String instance, String token) { this.context = context; + if( context == null) { + apiResponse = new APIResponse(); + APIError = new Error(); + return; + } SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); tootPerPage = sharedpreferences.getInt(Helper.SET_TOOTS_PER_PAGE, 40); accountPerPage = sharedpreferences.getInt(Helper.SET_ACCOUNTS_PER_PAGE, 40); @@ -1135,8 +1140,9 @@ public class API { /** * Retrieves Accounts when searching (ie: via @...) *synchronously* - * * @param query String search + * @param count int limit + * @param following boolean following only * @return APIResponse */ public APIResponse searchAccounts(String query, int count, boolean following) { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java index 3f5470671..94907d7a6 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java @@ -18,7 +18,6 @@ package fr.gouv.etalab.mastodon.client.Entities; import android.app.Activity; import android.content.*; import android.content.Context; -import android.database.sqlite.SQLiteDatabase; import android.graphics.Bitmap; import android.os.Build; import android.os.Bundle; @@ -44,11 +43,9 @@ import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.target.Target; import com.bumptech.glide.request.transition.Transition; -import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Objects; import java.util.regex.Matcher; import fr.gouv.etalab.mastodon.activities.HashTagActivity; @@ -56,7 +53,6 @@ import fr.gouv.etalab.mastodon.activities.ShowAccountActivity; import fr.gouv.etalab.mastodon.activities.WebviewActivity; import fr.gouv.etalab.mastodon.helper.Helper; import fr.gouv.etalab.mastodon.interfaces.OnRetrieveEmojiInterface; -import fr.gouv.etalab.mastodon.sqlite.Sqlite; /** * Created by Thomas on 23/04/2017. diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsSearchAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsSearchAdapter.java index f4f3db09d..e277f7b24 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsSearchAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsSearchAdapter.java @@ -18,7 +18,7 @@ package fr.gouv.etalab.mastodon.drawers; import android.content.Context; import android.content.SharedPreferences; import android.database.sqlite.SQLiteDatabase; -import android.support.annotation.NonNull;; +import android.support.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -147,9 +147,7 @@ public class AccountsSearchAdapter extends ArrayAdapter implements Filt protected FilterResults performFiltering(CharSequence constraint) { if (constraint != null) { suggestions.clear(); - for (Account account : tempAccounts) { - suggestions.add(account); - } + suggestions.addAll(tempAccounts); FilterResults filterResults = new FilterResults(); filterResults.values = suggestions; filterResults.count = suggestions.size(); @@ -164,10 +162,8 @@ public class AccountsSearchAdapter extends ArrayAdapter implements Filt ArrayList c = (ArrayList) results.values; if (results.count > 0) { clear(); - for (Account cust : c) { - add(cust); - notifyDataSetChanged(); - } + addAll(c); + notifyDataSetChanged(); } else{ clear(); notifyDataSetChanged(); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/EmojisSearchAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/EmojisSearchAdapter.java index f55fd2b09..cfcc83fc5 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/EmojisSearchAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/EmojisSearchAdapter.java @@ -113,9 +113,7 @@ public class EmojisSearchAdapter extends ArrayAdapter implements Filtera protected FilterResults performFiltering(CharSequence constraint) { if (constraint != null) { suggestions.clear(); - for (Emojis emoji : tempEmojis) { - suggestions.add(emoji); - } + suggestions.addAll(tempEmojis); FilterResults filterResults = new FilterResults(); filterResults.values = suggestions; filterResults.count = suggestions.size(); @@ -130,10 +128,8 @@ public class EmojisSearchAdapter extends ArrayAdapter implements Filtera ArrayList c = (ArrayList) results.values; if (results.count > 0) { clear(); - for (Emojis cust : c) { - add(cust); - notifyDataSetChanged(); - } + addAll(c); + notifyDataSetChanged(); } else{ clear(); notifyDataSetChanged(); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/TagsSearchAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/TagsSearchAdapter.java index 595c0107f..4b117b2c1 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/TagsSearchAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/TagsSearchAdapter.java @@ -100,9 +100,7 @@ public class TagsSearchAdapter extends ArrayAdapter implements Filterabl protected FilterResults performFiltering(CharSequence constraint) { if (constraint != null) { suggestions.clear(); - for (String tag : tempTags) { - suggestions.add(tag); - } + suggestions.addAll(tempTags); FilterResults filterResults = new FilterResults(); filterResults.values = suggestions; filterResults.count = suggestions.size(); @@ -117,10 +115,8 @@ public class TagsSearchAdapter extends ArrayAdapter implements Filterabl ArrayList c = (ArrayList) results.values; if (results.count > 0) { clear(); - for (String cust : c) { - add(cust); - notifyDataSetChanged(); - } + addAll(c); + notifyDataSetChanged(); } else{ clear(); notifyDataSetChanged();