From f976ebae8a89ea69aa190411d3d23089364e323a Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 19 Sep 2019 11:53:38 +0200
Subject: fixed R8 weirdness

---
 proguard-rules.pro                                                 | 4 ++++
 .../java/de/pixart/messenger/http/services/MuclumbusService.java   | 2 +-
 .../java/de/pixart/messenger/services/ChannelDiscoveryService.java | 7 +++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/proguard-rules.pro b/proguard-rules.pro
index 40684f33b..bfe8155cd 100644
--- a/proguard-rules.pro
+++ b/proguard-rules.pro
@@ -22,6 +22,10 @@
 -dontwarn java.lang.**
 -dontwarn javax.lang.**
 
+-keepclassmembers class de.pixart.messenger.http.services.** {
+  !transient <fields>;
+}
+
 # JSR 305 annotations are for embedding nullability information.
 -dontwarn javax.annotation.**
 
diff --git a/src/main/java/de/pixart/messenger/http/services/MuclumbusService.java b/src/main/java/de/pixart/messenger/http/services/MuclumbusService.java
index b849b664d..6ea1adad5 100644
--- a/src/main/java/de/pixart/messenger/http/services/MuclumbusService.java
+++ b/src/main/java/de/pixart/messenger/http/services/MuclumbusService.java
@@ -81,7 +81,7 @@ public interface MuclumbusService {
     }
 
     class SearchRequest {
-        public Set<String> keywords;
+        public final Set<String> keywords;
 
         public SearchRequest(String keyword) {
             this.keywords = Collections.singleton(keyword);
diff --git a/src/main/java/de/pixart/messenger/services/ChannelDiscoveryService.java b/src/main/java/de/pixart/messenger/services/ChannelDiscoveryService.java
index 2e376360a..a9b4c6504 100644
--- a/src/main/java/de/pixart/messenger/services/ChannelDiscoveryService.java
+++ b/src/main/java/de/pixart/messenger/services/ChannelDiscoveryService.java
@@ -41,7 +41,7 @@ public class ChannelDiscoveryService {
     }
 
     void initializeMuclumbusService() {
-        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        final OkHttpClient.Builder builder = new OkHttpClient.Builder();
         if (service.useTorToConnect()) {
             try {
                 builder.proxy(HttpConnectionManager.getProxy());
@@ -61,7 +61,6 @@ public class ChannelDiscoveryService {
 
     void discover(String query, OnChannelSearchResultsFound onChannelSearchResultsFound) {
         final boolean all = query == null || query.trim().isEmpty();
-        Log.d(Config.LOGTAG, "discover channels. query=" + query);
         List<MuclumbusService.Room> result = cache.getIfPresent(all ? "" : query);
         if (result != null) {
             onChannelSearchResultsFound.onChannelSearchResultsFound(result);
@@ -102,8 +101,8 @@ public class ChannelDiscoveryService {
     }
 
     private void discoverChannels(final String query, OnChannelSearchResultsFound listener) {
-        Call<MuclumbusService.SearchResult> searchResultCall = muclumbusService.search(new MuclumbusService.SearchRequest(query));
-
+        MuclumbusService.SearchRequest searchRequest = new MuclumbusService.SearchRequest(query);
+        Call<MuclumbusService.SearchResult> searchResultCall = muclumbusService.search(searchRequest);
         searchResultCall.enqueue(new Callback<MuclumbusService.SearchResult>() {
             @Override
             public void onResponse(@NonNull Call<MuclumbusService.SearchResult> call, @NonNull Response<MuclumbusService.SearchResult> response) {
-- 
cgit v1.2.3