mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-18 03:48:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add some fix

Browse source
This commit is contained in:
Erwan Croze 2018-08-14 10:16:57 +02:00
parent dcdda672d8
commit f86c16ff27
7 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/drawable-xhdpi/back_white.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

3
res/layout/about.xml
View file

@ -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"/>
</LinearLayout>
<LinearLayout

7
res/layout/chat_bubble.xml
View file

@ -112,13 +112,8 @@
android:textColor="#595959"
android:textSize="13.3sp"
android:textStyle="bold"/>
<LinearLayout
android:id="@+id/separator"
android:layout_width="100dp"
android:layout_height="10dp"
android:orientation="horizontal"/>
<RelativeLayout
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">

13
src/android/org/linphone/activities/LinphoneActivity.java
View file

@ -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");
}

2
src/android/org/linphone/fragments/AboutFragment.java
View file

@ -167,7 +167,7 @@ public class AboutFragment extends Fragment implements OnClickListener {
lc.resetLogCollection();
}
} else */if (v == cancel) {
LinphoneActivity.instance().displayContacts(false);
LinphoneActivity.instance().popBackStack();
}
}
}

2
submodules/bctoolbox

@ -1 +1 @@
Subproject commit 8d3a016378aedcc14438ac55d5549faf79a7325b
Subproject commit 405da744b62e299d4324988de7bcdbf9779b21ac

2
submodules/linphone

@ -1 +1 @@
Subproject commit 5c01b88682ce3bd483ba071424cd9384839e9c13
Subproject commit 6edf43c37dfc4e2c4d785fd4068748a158a4b264