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

Fix Save dialog on call view after a rotation

Browse source
This commit is contained in:
Erwan Croze 2017-01-31 15:49:58 +01:00
parent 40ee88eba5
commit bdb578121f
4 changed files with 51 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -17,6 +17,7 @@ Group changes to describe their impact on the project, as follows:
### Fixed
- Rotation after screen locking
- Contacts background task
## [Unreleased]

59
src/org/linphone/CallActivity.java
View file

@ -113,6 +113,8 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
private int cameraNumber;
private CountDownTimer timer;
private boolean isVideoCallPaused = false;
private Dialog dialog = null;
private static long TimeRemind = 0;
private static PowerManager powerManager;
private static PowerManager.WakeLock wakeLock;
@ -225,24 +227,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
boolean autoAcceptCameraPolicy = LinphonePreferences.instance().shouldAutomaticallyAcceptVideoRequests();
if (remoteVideo && !localVideo && !autoAcceptCameraPolicy && !LinphoneManager.getLc().isInConference()) {
showAcceptCallUpdateDialog();
timer = new CountDownTimer(SECONDS_BEFORE_DENYING_CALL_UPDATE, 1000) {
public void onTick(long millisUntilFinished) { }
public void onFinish() {
//TODO dismiss dialog
acceptCallUpdate(false);
}
}.start();
/*showAcceptCallUpdateDialog();
timer = new CountDownTimer(SECONDS_BEFORE_DENYING_CALL_UPDATE, 1000) {
public void onTick(long millisUntilFinished) { }
public void onFinish() {
//TODO dismiss dialog
}
}.start();*/
createTimerForDialog(SECONDS_BEFORE_DENYING_CALL_UPDATE);
}
// else if (remoteVideo && !LinphoneManager.getLc().isInConference() && autoAcceptCameraPolicy) {
// mHandler.post(new Runnable() {
@ -286,6 +271,11 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
isSpeakerEnabled = savedInstanceState.getBoolean("Speaker");
isMicMuted = savedInstanceState.getBoolean("Mic");
isVideoCallPaused = savedInstanceState.getBoolean("VideoCallPaused");
if (savedInstanceState.getBoolean("AskingVideo")) {
showAcceptCallUpdateDialog();
TimeRemind = savedInstanceState.getLong("TimeRemind");
createTimerForDialog(TimeRemind);
}
refreshInCallActions();
return;
} else {
@ -314,6 +304,21 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
}
}
public void createTimerForDialog(long time) {
timer = new CountDownTimer(time , 1000) {
public void onTick(long millisUntilFinished) {
TimeRemind = millisUntilFinished;
}
public void onFinish() {
if (dialog != null) {
dialog.dismiss();
dialog = null;
}
acceptCallUpdate(false);
}
}.start();
}
private boolean isVideoEnabled(LinphoneCall call) {
if(call != null){
return call.getCurrentParamsCopy().getVideoEnabled();
@ -326,7 +331,9 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
outState.putBoolean("Speaker", LinphoneManager.getLc().isSpeakerEnabled());
outState.putBoolean("Mic", LinphoneManager.getLc().isMicMuted());
outState.putBoolean("VideoCallPaused", isVideoCallPaused);
outState.putBoolean("AskingVideo", (dialog != null));
outState.putLong("TimeRemind", TimeRemind);
if (dialog != null) dialog.dismiss();
super.onSaveInstanceState(outState);
}
@ -1138,7 +1145,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
private void showAcceptCallUpdateDialog() {
final Dialog dialog = new Dialog(this);
dialog = new Dialog(this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
Drawable d = new ColorDrawable(ContextCompat.getColor(this, R.color.colorC));
d.setAlpha(200);
@ -1166,6 +1173,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
}
dialog.dismiss();
dialog = null;
}
});
@ -1176,6 +1184,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
CallActivity.instance().acceptCallUpdate(false);
}
dialog.dismiss();
dialog = null;
}
});
dialog.show();
@ -1290,6 +1299,16 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
return super.onKeyDown(keyCode, event);
}
@Override // Never invoke actually
public void onBackPressed() {
if (dialog != null) {
acceptCallUpdate(false);
dialog.dismiss();
dialog = null;
}
return;
}
public void bindAudioFragment(CallAudioFragment fragment) {
audioCallFragment = fragment;
}

20
src/org/linphone/CallAudioFragment.java
View file

@ -30,19 +30,19 @@ import android.view.ViewGroup;
*/
public class CallAudioFragment extends Fragment {
private CallActivity incallActvityInstance;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.audio, container, false);
return view;
}
@Override
public void onStart() {
super.onStart();
incallActvityInstance = (CallActivity) getActivity();
if (incallActvityInstance != null) {
incallActvityInstance.bindAudioFragment(this);
}
@ -52,19 +52,19 @@ public class CallAudioFragment extends Fragment {
incallActvityInstance.removeCallbacks();
}
}
class SwipeGestureDetector implements OnTouchListener {
static final int MIN_DISTANCE = 100;
private float downX, upX;
private boolean lock;
private SwipeListener listener;
public SwipeGestureDetector(SwipeListener swipeListener) {
super();
listener = swipeListener;
}
@Override
public boolean onTouch(View v, MotionEvent event) {
switch(event.getAction()){
@ -72,7 +72,7 @@ public class CallAudioFragment extends Fragment {
lock = false;
downX = event.getX();
return true;
case MotionEvent.ACTION_MOVE:
if (lock) {
return false;
@ -91,7 +91,7 @@ public class CallAudioFragment extends Fragment {
return false;
}
}
interface SwipeListener {
void onRightToLeftSwipe();
void onLeftToRightSwipe();

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

@ -869,7 +869,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
missedCalls.setText(missedCallsCount + "");
missedCalls.setVisibility(View.VISIBLE);
} else {
LinphoneManager.getLc().resetMissedCallsCount();
if (LinphoneManager.isInstanciated()) LinphoneManager.getLc().resetMissedCallsCount();
missedCalls.clearAnimation();
missedCalls.setVisibility(View.GONE);
}