From 97e91d808c8ce5db86aebb1874217b2b154d89db Mon Sep 17 00:00:00 2001 From: tom79 Date: Wed, 27 Nov 2019 17:59:08 +0100 Subject: [PATCH] Fix accounts not displayed in about page --- .../fedilab/android/activities/BaseMainActivity.java | 2 -- .../app/fedilab/android/client/HttpsConnection.java | 2 +- .../android/fragments/DisplayStatusFragment.java | 11 +---------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java index 7d3eafa00..4e8cfcc4c 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java @@ -2234,8 +2234,6 @@ public abstract class BaseMainActivity extends BaseActivity displayStatusFragment.scrollToTop(); } } - DrawerLayout drawer = findViewById(R.id.drawer_layout); - drawer.closeDrawer(GravityCompat.START); } }); diff --git a/app/src/main/java/app/fedilab/android/client/HttpsConnection.java b/app/src/main/java/app/fedilab/android/client/HttpsConnection.java index 20bcf488e..8691798b3 100644 --- a/app/src/main/java/app/fedilab/android/client/HttpsConnection.java +++ b/app/src/main/java/app/fedilab/android/client/HttpsConnection.java @@ -163,7 +163,7 @@ public class HttpsConnection { HttpUrl.Builder httpBuider = Objects.requireNonNull(HttpUrl.parse(urlConnection)).newBuilder(); if (paramaters != null) { for (Map.Entry param : paramaters.entrySet()) { - httpBuider.addQueryParameter(param.getKey(), param.getValue()); + httpBuider.addEncodedQueryParameter(param.getKey(), param.getValue()); } } if (token != null && !token.startsWith("Basic ")) { diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java index c73d44d95..9e6d35ccc 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java @@ -831,16 +831,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn public void scrollToTop() { - if (lv_status != null && instanceType != null) { - if (statusListAdapter != null && (instanceType.equals("MASTODON") || instanceType.equals("MISSKEY") || instanceType.equals("GNU"))) - lv_status.setAdapter(statusListAdapter); - else if (pixelfedListAdapter != null && instanceType.equals("PIXELFED")) - lv_status.setAdapter(pixelfedListAdapter); - else if (artListAdapter != null && instanceType.equals("ART")) - lv_status.setAdapter(artListAdapter); - else if (peertubeAdapater != null && instanceType.equals("PEERTUBE")) - lv_status.setAdapter(peertubeAdapater); - } + mLayoutManager.scrollToPositionWithOffset(0, 0); } /**