From fac1808b3dd5f839bffb6b3568d476f1ca6511c8 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 24 Jan 2019 11:11:23 +0100
Subject: [PATCH] Some minor improvements

---
 app/build.gradle                                 |   2 +-
 .../org/linphone/call/CallOutgoingActivity.java  |   4 ++--
 .../org/linphone/contacts/ContactsManager.java   |   1 +
 .../linphone/settings/LinphonePreferences.java   |   1 -
 .../org/linphone/views/BitmapWorkerTask.java     |   6 ++++--
 .../main/res/drawable-xhdpi/speaker_default.png  | Bin 1977 -> 0 bytes
 .../main/res/drawable-xhdpi/speaker_selected.png | Bin 1782 -> 0 bytes
 app/src/main/res/drawable/speaker.xml            |   4 ++--
 .../main/res/values/non_localizable_custom.xml   |   2 +-
 app/src/main/res/values/strings.xml              |  10 +++++-----
 10 files changed, 16 insertions(+), 14 deletions(-)
 delete mode 100644 app/src/main/res/drawable-xhdpi/speaker_default.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/speaker_selected.png

diff --git a/app/build.gradle b/app/build.gradle
index 483b85aa0..18d4ef4fd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -118,7 +118,7 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'com.google.android.material:material:1.1.0-alpha01'
+    implementation 'com.google.android.material:material:1.1.0-alpha02'
     implementation 'com.google.android:flexbox:1.1.0'
 
     if (isLocalAarAvailable()) {
diff --git a/app/src/main/java/org/linphone/call/CallOutgoingActivity.java b/app/src/main/java/org/linphone/call/CallOutgoingActivity.java
index 17d2a9f81..63dcf5024 100644
--- a/app/src/main/java/org/linphone/call/CallOutgoingActivity.java
+++ b/app/src/main/java/org/linphone/call/CallOutgoingActivity.java
@@ -226,9 +226,9 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC
         if (id == R.id.speaker) {
             mIsSpeakerEnabled = !mIsSpeakerEnabled;
             if (mIsSpeakerEnabled) {
-                mSpeaker.setImageResource(R.drawable.speaker_selected);
+                mSpeaker.setImageResource(R.drawable.route_speaker_selected);
             } else {
-                mSpeaker.setImageResource(R.drawable.speaker_default);
+                mSpeaker.setImageResource(R.drawable.route_speaker_default);
             }
             LinphoneManager.getInstance().enableSpeaker(mIsSpeakerEnabled);
         }
diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.java b/app/src/main/java/org/linphone/contacts/ContactsManager.java
index 8531906fe..36fd1905f 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsManager.java
+++ b/app/src/main/java/org/linphone/contacts/ContactsManager.java
@@ -309,6 +309,7 @@ public class ContactsManager extends ContentObserver implements FriendListListen
         } catch (RemoteException e) {
             Log.e("[Contacts Manager] Couldn't make contacts account visible: " + e);
         }
+        client.close();
     }
 
     public void initializeSyncAccount(Activity activity) {
diff --git a/app/src/main/java/org/linphone/settings/LinphonePreferences.java b/app/src/main/java/org/linphone/settings/LinphonePreferences.java
index 3c3758e1f..930dd9edc 100644
--- a/app/src/main/java/org/linphone/settings/LinphonePreferences.java
+++ b/app/src/main/java/org/linphone/settings/LinphonePreferences.java
@@ -1503,7 +1503,6 @@ public class LinphonePreferences {
          * @throws CoreException
          */
         public void saveNewAccount() throws CoreException {
-
             if (tempUsername == null
                     || tempUsername.length() < 1
                     || tempDomain == null
diff --git a/app/src/main/java/org/linphone/views/BitmapWorkerTask.java b/app/src/main/java/org/linphone/views/BitmapWorkerTask.java
index b3dd2e0f2..45be955ef 100644
--- a/app/src/main/java/org/linphone/views/BitmapWorkerTask.java
+++ b/app/src/main/java/org/linphone/views/BitmapWorkerTask.java
@@ -43,6 +43,7 @@ public class BitmapWorkerTask extends AsyncTask<String, Void, Bitmap> {
     private final WeakReference<ImageView> mImageViewReference;
     private final Context mContext;
     private final Bitmap mDefaultBitmap;
+    private final int mImageViewHeight;
 
     public BitmapWorkerTask(Context context, ImageView imageView, Bitmap defaultBitmap) {
         mContext = context;
@@ -50,6 +51,7 @@ public class BitmapWorkerTask extends AsyncTask<String, Void, Bitmap> {
         path = null;
         // Use a WeakReference to ensure the ImageView can be garbage collected
         mImageViewReference = new WeakReference<>(imageView);
+        mImageViewHeight = imageView.getMeasuredHeight();
     }
 
     public static BitmapWorkerTask getBitmapWorkerTask(ImageView imageView) {
@@ -103,7 +105,7 @@ public class BitmapWorkerTask extends AsyncTask<String, Void, Bitmap> {
                 int pictureOrientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0);
                 if (pictureOrientation == 6 || pictureOrientation == 3 || pictureOrientation == 8) {
                     if (imageView != null) {
-                        float factor = (float) imageView.getMeasuredHeight() / height;
+                        float factor = (float) mImageViewHeight / height;
                         matrix.postScale(factor, factor);
                     }
                     if (pictureOrientation == 6) {
@@ -125,7 +127,7 @@ public class BitmapWorkerTask extends AsyncTask<String, Void, Bitmap> {
 
             if (thumbnail == null && bm != null) {
                 if (imageView == null) return bm;
-                thumbnail = scaleToFitHeight(bm, imageView.getMeasuredHeight());
+                thumbnail = scaleToFitHeight(bm, mImageViewHeight);
                 if (thumbnail != bm) {
                     bm.recycle();
                 }
diff --git a/app/src/main/res/drawable-xhdpi/speaker_default.png b/app/src/main/res/drawable-xhdpi/speaker_default.png
deleted file mode 100644
index e3621092ea766da566ed99b720301e06a02dc020..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1977
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
LNkvXXu0mjfa~rp5

diff --git a/app/src/main/res/drawable-xhdpi/speaker_selected.png b/app/src/main/res/drawable-xhdpi/speaker_selected.png
deleted file mode 100644
index b7f86d022d1ad3cd0c7c1c1ce23ea40436c9af3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1782
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
Y3#gUjylHMGVgLXD07*qoM6N<$g0}1=#{d8T

diff --git a/app/src/main/res/drawable/speaker.xml b/app/src/main/res/drawable/speaker.xml
index 0ccd6e57f..428395dee 100644
--- a/app/src/main/res/drawable/speaker.xml
+++ b/app/src/main/res/drawable/speaker.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/speaker_selected"
+    <item android:drawable="@drawable/route_speaker_selected"
         android:state_selected="true" />
     <item
-         android:drawable="@drawable/speaker_default" />
+         android:drawable="@drawable/route_speaker_default" />
 </selector>
diff --git a/app/src/main/res/values/non_localizable_custom.xml b/app/src/main/res/values/non_localizable_custom.xml
index e9e4000ec..a6c42887d 100644
--- a/app/src/main/res/values/non_localizable_custom.xml
+++ b/app/src/main/res/values/non_localizable_custom.xml
@@ -118,7 +118,7 @@
     <bool name="hide_settings_from_side_menu">false</bool>
 
     <!-- Others Parameters-->
-    <string name="about_text">GNU General Public License V2\n © 2010-2018 Belledonne Communications</string>
+    <string name="about_text">GNU General Public License V2\n © 2010–2018 Belledonne Communications</string>
     <string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
     <bool name="enable_call_notification">true</bool>
     <bool name="kill_service_with_task_manager">true</bool>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4705ae2a6..8dcd68868 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -183,9 +183,9 @@
     <string name="no_chat_history">No conversations</string>
     <string name="delete_conversation">Do you want to delete selected conversation?</string>
     <string name="delete_message">Do you want to delete selected message?</string>
-    <string name="remote_composing">Remote is writing...</string>
-    <string name="remote_composing_single">%s is writing...</string>
-    <string name="remote_composing_multiple">%s are writing...</string>
+    <string name="remote_composing">Remote is writing…</string>
+    <string name="remote_composing_single">%s is writing…</string>
+    <string name="remote_composing_multiple">%s are writing…</string>
     <string name="share_picture_size_small">Small</string>
     <string name="share_picture_size_medium">Medium</string>
     <string name="share_picture_size_large">Large</string>
@@ -195,7 +195,7 @@
     <string name="image_picker_title">Select source</string>
     <string name="image_saved">Image saved</string>
     <string name="image_not_saved">Error, image not saved</string>
-    <string name="wait">Please wait...</string>
+    <string name="wait">Please wait…</string>
     <string name="image_transfert_error">An error occurred during the file transfer</string>
     <string name="message_not_encrypted">This message is not encrypted</string>
     <string name="message_cant_be_decrypted">You have received an encrypted message you are unable to decrypt from %s\nYou need to call your correspondant in order to exchange your ZRTP keys if you want to decrypt the future messages you will receive.</string>
@@ -325,7 +325,7 @@
     <string name="error_unauthorized">Unauthorized</string>
     <string name="error_io_error">Network error</string>
     <string name="download_image_failed">Download failed. Please check your network connection or try again later.</string>
-    <string name="remote_provisioning_failure">Failed to download or apply remote provisioning profile...</string>
+    <string name="remote_provisioning_failure">Failed to download or apply remote provisioning profile…</string>
     <string name="remote_provisioning_again_title">Remote provisioning</string>
     <string name="remote_provisioning_again_message">Do you want to change the provisioning URI?</string>