From f86c16ff274366d0d4e60d319731a39404133035 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Tue, 14 Aug 2018 10:16:57 +0200 Subject: [PATCH] Add some fix --- res/drawable-xhdpi/back_white.png | Bin 0 -> 3343 bytes res/layout/about.xml | 3 +-- res/layout/chat_bubble.xml | 7 +------ .../linphone/activities/LinphoneActivity.java | 13 +------------ .../org/linphone/fragments/AboutFragment.java | 2 +- submodules/bctoolbox | 2 +- submodules/linphone | 2 +- 7 files changed, 6 insertions(+), 23 deletions(-) create mode 100644 res/drawable-xhdpi/back_white.png diff --git a/res/drawable-xhdpi/back_white.png b/res/drawable-xhdpi/back_white.png new file mode 100644 index 0000000000000000000000000000000000000000..5c88641fa09edad28485bcfe355c1ce838f1eea8 GIT binary patch literal 3343 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 AMgRZ+ literal 0 HcmV?d00001 diff --git a/res/layout/about.xml b/res/layout/about.xml index e02985c07..57a34f5e6 100644 --- a/res/layout/about.xml +++ b/res/layout/about.xml @@ -36,8 +36,7 @@ android:layout_height="match_parent" android:layout_weight="0.2" android:contentDescription="@string/content_description_edit" - android:padding="10dp" - android:src="@drawable/footer_contacts"/> + android:src="@drawable/back_white"/> - - diff --git a/src/android/org/linphone/activities/LinphoneActivity.java b/src/android/org/linphone/activities/LinphoneActivity.java index 45dc55765..ffae707ce 100644 --- a/src/android/org/linphone/activities/LinphoneActivity.java +++ b/src/android/org/linphone/activities/LinphoneActivity.java @@ -184,17 +184,6 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick //This must be done before calling super.onCreate(). super.onCreate(savedInstanceState); - //Obiane specifics - //HTTP to HTTPS migration - try { - if (LinphonePreferences.instance().getRemoteProvisioningUrl() != null - && LinphonePreferences.instance().getRemoteProvisioningUrl().startsWith("http://")) { - LinphonePreferences.instance().setRemoteProvisioningUrl(LinphonePreferences.instance().getRemoteProvisioningUrl().replace("http://", "https://")); - } - }catch(NullPointerException nPE){ - Log.e(nPE); - } - if (getResources().getBoolean(R.bool.orientation_portrait_only)) { setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); } @@ -239,7 +228,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick currentFragment = FragmentsAvailable.EMPTY; if (savedInstanceState == null) { - displayContacts(false); + goToChatList(); } else { currentFragment = (FragmentsAvailable) savedInstanceState.getSerializable("currentFragment"); } diff --git a/src/android/org/linphone/fragments/AboutFragment.java b/src/android/org/linphone/fragments/AboutFragment.java index ea38fbc0a..ac4f8af65 100644 --- a/src/android/org/linphone/fragments/AboutFragment.java +++ b/src/android/org/linphone/fragments/AboutFragment.java @@ -167,7 +167,7 @@ public class AboutFragment extends Fragment implements OnClickListener { lc.resetLogCollection(); } } else */if (v == cancel) { - LinphoneActivity.instance().displayContacts(false); + LinphoneActivity.instance().popBackStack(); } } } diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 8d3a01637..405da744b 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 8d3a016378aedcc14438ac55d5549faf79a7325b +Subproject commit 405da744b62e299d4324988de7bcdbf9779b21ac diff --git a/submodules/linphone b/submodules/linphone index 5c01b8868..6edf43c37 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 5c01b88682ce3bd483ba071424cd9384839e9c13 +Subproject commit 6edf43c37dfc4e2c4d785fd4068748a158a4b264