Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Lot of little fix

Browse source
This commit is contained in:
Erwan Croze 2017-10-03 17:30:34 +02:00
parent 58da65b26e
commit 56bf83129f
6 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/android/org/linphone/ChatFragment.java
View file

@ -1344,6 +1344,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
}
public void refreshHistory() {
if (history == null || chatRoom == null) return;
history.clear();
LinphoneChatMessage[] messages = chatRoom.getHistory();
history.addAll(Arrays.asList(messages));

2
src/android/org/linphone/HistoryListFragment.java
View file

@ -427,6 +427,8 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
view.setTag(holder);
}
if (mLogs == null || mLogs.size() < position) return view;
final LinphoneCallLog log = mLogs.get(position);
long timestamp = log.getTimestamp();
LinphoneAddress address;

3
src/android/org/linphone/LinphoneActivity.java
View file

@ -1683,7 +1683,8 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
}
public void refreshAccounts(){
if (LinphoneManager.getLc().getProxyConfigList().length > 1) {
if (LinphoneManager.getLc().getProxyConfigList() != null &&
LinphoneManager.getLc().getProxyConfigList().length > 1) {
accountsList.setVisibility(View.VISIBLE);
accountsList.setAdapter(new AccountsListAdapter());
accountsList.setOnItemClickListener(new AdapterView.OnItemClickListener() {

4
src/android/org/linphone/LinphonePreferences.java
View file

@ -476,6 +476,10 @@ public class LinphonePreferences {
LinphoneAuthInfo old_info = getAuthInfo(n);
try {
LinphoneProxyConfig prxCfg = getProxyConfig(n);
if (prxCfg == null) {
Log.e("Error, no proxy config at index " + n);
return;
}
prxCfg.edit();
prxCfg.setIdentity(identity);
prxCfg.enableRegister(true);

2
src/android/org/linphone/LinphoneUtils.java
View file

@ -279,7 +279,7 @@ public final class LinphoneUtils {
try {
bm = MediaStore.Images.Media.getBitmap(c.getContentResolver(),tUri);
} catch (IOException e) {
LinphoneActivity.instance().displayCustomToast("Something wrong happened", Toast.LENGTH_LONG);
Log.e("Error in setThumbnailPictureFromUri: " + e);
return;
}
if (bm != null) {

8
src/android/org/linphone/SettingsFragment.java
View file

@ -1351,9 +1351,11 @@ public class SettingsFragment extends PreferencesListFragment {
@Override
public void onPause() {
if (LinphoneManager.getInstance().getEchoTesterStatus())
stopEchoTester();
LinphoneActivity.instance().hideTopBar();
if (LinphoneActivity.isInstanciated() && LinphoneManager.isInstanciated()) {
if (LinphoneManager.getInstance().getEchoTesterStatus())
stopEchoTester();
LinphoneActivity.instance().hideTopBar();
}
super.onPause();
}
}