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

Some small fixes

Browse source
This commit is contained in:
Sylvain Berfini 2012-08-09 16:44:04 +02:00
parent 735ce7389d
commit edf72eda24
2 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/org/linphone/HistoryFragment.java
View file

@ -115,20 +115,13 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnChil
} }
private void initMissedLogsLists(List<LinphoneCallLog> logs) { private void initMissedLogsLists(List<LinphoneCallLog> logs) {
initLogsLists(logs); List<LinphoneCallLog> missedLogs = new ArrayList<LinphoneCallLog>();
for (int k = 0; k < mLogs.size(); k++) { for (LinphoneCallLog log : logs) {
List<LinphoneCallLog> group = mLogs.get(k);
boolean removeGroup = true;
for (LinphoneCallLog log : group) {
if (log.getDirection() == CallDirection.Incoming && log.getStatus() == CallStatus.Missed) { if (log.getDirection() == CallDirection.Incoming && log.getStatus() == CallStatus.Missed) {
removeGroup = false; missedLogs.add(log);
break;
}
}
if (removeGroup) {
mLogs.remove(k);
} }
} }
initLogsLists(missedLogs);
} }
private void expandAllGroups() { private void expandAllGroups() {
@ -202,11 +195,9 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnChil
isEditMode = true; isEditMode = true;
} }
historyList.setAdapter(new CallHistoryAdapter(getActivity().getApplicationContext())); historyList.setAdapter(new CallHistoryAdapter(getActivity()));
if (id != R.id.ok) {
expandAllGroups(); expandAllGroups();
} }
}
@Override @Override
public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) { public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) {
@ -216,7 +207,7 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnChil
} }
initLogsLists(Arrays.asList(LinphoneManager.getLc().getCallLogs())); initLogsLists(Arrays.asList(LinphoneManager.getLc().getCallLogs()));
historyList.setAdapter(new CallHistoryAdapter(getActivity().getApplicationContext())); historyList.setAdapter(new CallHistoryAdapter(getActivity()));
expandAllGroups(); expandAllGroups();
} }
return false; return false;
@ -228,7 +219,7 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnChil
if (isEditMode) { if (isEditMode) {
LinphoneManager.getLc().removeCallLog(log); LinphoneManager.getLc().removeCallLog(log);
initLogsLists(Arrays.asList(LinphoneManager.getLc().getCallLogs())); initLogsLists(Arrays.asList(LinphoneManager.getLc().getCallLogs()));
historyList.setAdapter(new CallHistoryAdapter(getActivity().getApplicationContext())); historyList.setAdapter(new CallHistoryAdapter(getActivity()));
expandAllGroups(); expandAllGroups();
} else { } else {
LinphoneAddress address; LinphoneAddress address;

2
src/org/linphone/InCallActivity.java
View file

@ -384,7 +384,7 @@ public class InCallActivity extends FragmentActivity implements
public void displayVideoCallControlsIfHidden() { public void displayVideoCallControlsIfHidden() {
if (mControlsLayout != null) { if (mControlsLayout != null) {
if (mControlsLayout.getVisibility() == View.GONE) { if (mControlsLayout.getVisibility() != View.VISIBLE) {
if (isAnimationDisabled) { if (isAnimationDisabled) {
mControlsLayout.setVisibility(View.VISIBLE); mControlsLayout.setVisibility(View.VISIBLE);
if (cameraNumber > 1) { if (cameraNumber > 1) {