Mastodon/Tusky-App-Android
1
0
Fork 0
mirror of https://github.com/tuskyapp/Tusky synced 2025-02-03 13:57:35 +01:00
Code Issues Releases Wiki Activity

Fix search breaking due to newly introduced variables in utils classes

Browse Source
This commit is contained in:
HellPie 2018-08-31 02:16:31 +02:00 committed by HellPie
parent 472effd4a0
commit 73dc85a115
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/keylesspalace/tusky/adapter/SearchResultsAdapter.java
View File

@ -48,12 +48,16 @@ public class SearchResultsAdapter extends RecyclerView.Adapter {
private boolean mediaPreviewsEnabled;
private boolean alwaysShowSensitiveMedia;
private boolean collapseLongStatusContent;
private LinkListener linkListener;
private StatusActionListener statusListener;
public SearchResultsAdapter(boolean mediaPreviewsEnabled, boolean alwaysShowSensitiveMedia,
LinkListener linkListener, StatusActionListener statusListener) {
public SearchResultsAdapter(boolean mediaPreviewsEnabled,
boolean alwaysShowSensitiveMedia,
boolean collapseLongStatusContent,
LinkListener linkListener,
StatusActionListener statusListener) {
this.accountList = Collections.emptyList();
this.statusList = Collections.emptyList();
@ -62,6 +66,7 @@ public class SearchResultsAdapter extends RecyclerView.Adapter {
this.mediaPreviewsEnabled = mediaPreviewsEnabled;
this.alwaysShowSensitiveMedia = alwaysShowSensitiveMedia;
this.collapseLongStatusContent = collapseLongStatusContent;
this.linkListener = linkListener;
this.statusListener = statusListener;
@ -150,7 +155,11 @@ public class SearchResultsAdapter extends RecyclerView.Adapter {
accountList = results.getAccounts();
statusList = results.getStatuses();
for(Status status: results.getStatuses()) {
concreteStatusList.add(ViewDataUtils.statusToViewData(status, alwaysShowSensitiveMedia));
concreteStatusList.add(ViewDataUtils.statusToViewData(
status,
alwaysShowSensitiveMedia,
collapseLongStatusContent
));
}
hashtagList = results.getHashtags();

29
app/src/main/java/com/keylesspalace/tusky/fragment/SearchFragment.kt
View File

@ -50,6 +50,7 @@ class SearchFragment : SFragment(), StatusActionListener, Injectable {
private var alwaysShowSensitiveMedia = false
private var mediaPreviewEnabled = true
private var collapseLongStatusContent = true;
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@ -61,9 +62,17 @@ class SearchFragment : SFragment(), StatusActionListener, Injectable {
alwaysShowSensitiveMedia = preferences.getBoolean("alwaysShowSensitiveMedia", false)
mediaPreviewEnabled = preferences.getBoolean("mediaPreviewEnabled", true)
collapseLongStatusContent = preferences.getBoolean("collapseLongStatuses", true);
searchRecyclerView.addItemDecoration(DividerItemDecoration(view.context, DividerItemDecoration.VERTICAL))
searchRecyclerView.layoutManager = LinearLayoutManager(view.context)
searchAdapter = SearchResultsAdapter(mediaPreviewEnabled, alwaysShowSensitiveMedia, this, this)
searchAdapter = SearchResultsAdapter(
mediaPreviewEnabled,
alwaysShowSensitiveMedia,
collapseLongStatusContent,
this,
this
)
searchRecyclerView.adapter = searchAdapter
}
@ -139,7 +148,14 @@ class SearchFragment : SFragment(), StatusActionListener, Injectable {
timelineCases.reblogWithCallback(status, reblog, object: Callback<Status> {
override fun onResponse(call: Call<Status>?, response: Response<Status>?) {
status.reblogged = true
searchAdapter.updateStatusAtPosition(ViewDataUtils.statusToViewData(status, alwaysShowSensitiveMedia), position)
searchAdapter.updateStatusAtPosition(
ViewDataUtils.statusToViewData(
status,
alwaysShowSensitiveMedia,
collapseLongStatusContent
),
position
)
}
override fun onFailure(call: Call<Status>?, t: Throwable?) {
@ -156,7 +172,14 @@ class SearchFragment : SFragment(), StatusActionListener, Injectable {
timelineCases.favouriteWithCallback(status, favourite, object: Callback<Status> {
override fun onResponse(call: Call<Status>?, response: Response<Status>?) {
status.favourited = true
searchAdapter.updateStatusAtPosition(ViewDataUtils.statusToViewData(status, alwaysShowSensitiveMedia), position)
searchAdapter.updateStatusAtPosition(
ViewDataUtils.statusToViewData(
status,
alwaysShowSensitiveMedia,
collapseLongStatusContent
),
position
)
}
override fun onFailure(call: Call<Status>?, t: Throwable?) {