From eed45287ef036d89d441526df67fa7060f530cde Mon Sep 17 00:00:00 2001
From: genofire <geno+dev@fireorbit.de>
Date: Fri, 24 Apr 2020 01:57:05 +0200
Subject: [PATCH] fix jingle by libery and for sum7

---
 build.gradle                                                   | 3 ++-
 .../java/eu/siacs/conversations/ui/ConversationFragment.java   | 3 +--
 .../java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 3 +--
 src/main/res/layout/activity_rtp_session.xml                   | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 428737f27..147ab4f39 100644
--- a/build.gradle
+++ b/build.gradle
@@ -80,7 +80,8 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:3.12.10'
     implementation 'com.google.guava:guava:27.1-android'
     quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.11.1'
-    implementation fileTree(include: ['libwebrtc-m81.aar'], dir: 'libs')
+    implementation 'org.webrtc:google-webrtc:1.0.30039'
+    //implementation fileTree(include: ['libwebrtc-m81.aar'], dir: 'libs')
 }
 
 ext {
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 0f47f6936..0e33cde2b 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1995,7 +1995,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
             this.binding.textinput.append(this.conversation.getNextMessage());
         }
         this.binding.textinput.setKeyboardListener(this);
-        messageListAdapter.updatePreferences();
         refresh(false);
         this.conversation.messagesLoaded.set(true);
         Log.d(Config.LOGTAG, "scrolledToBottomAndNoPending=" + Boolean.toString(scrolledToBottomAndNoPending));
@@ -2903,4 +2902,4 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         }
         activity.switchToAccount(message.getConversation().getAccount(), fingerprint);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 1a7dc8e4f..4bc9c75b4 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -100,7 +100,6 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
         this.audioPlayer = new AudioPlayer(this);
         this.activity = activity;
         metrics = getContext().getResources().getDisplayMetrics();
-        updatePreferences();
     }
 
 
@@ -355,7 +354,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
             body.setSpan(new DividerSpan(false), end, end + 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
         int color = darkBackground ? this.getMessageTextColor(darkBackground, false)
-                : ContextCompat.getColor(activity, R.color.green700_desaturated);
+                : ContextCompat.getColor(activity, R.color.orange700_desaturated);
         DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();
         body.setSpan(new QuoteSpan(color, metrics), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
     }
diff --git a/src/main/res/layout/activity_rtp_session.xml b/src/main/res/layout/activity_rtp_session.xml
index 47bfa95ca..2321c6f1b 100644
--- a/src/main/res/layout/activity_rtp_session.xml
+++ b/src/main/res/layout/activity_rtp_session.xml
@@ -191,7 +191,7 @@
                 android:layout_margin="16dp"
                 android:src="@drawable/ic_call_white_48dp"
                 android:visibility="gone"
-                app:backgroundTint="@color/green700"
+                app:backgroundTint="@color/green500"
                 app:elevation="4dp"
                 app:fabCustomSize="72dp"
                 app:maxImageSize="36dp"