gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few bugs with permissions

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-06-19 20:37:07 +02:00
parent a4e03bc970
commit ccd2c847bb
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.java
View File

@ -69,6 +69,7 @@ public class MagicCallActivity extends AppCompatActivity {
getWindow().getDecorView().setSystemUiVisibility(getSystemUiVisibility()); getWindow().getDecorView().setSystemUiVisibility(getSystemUiVisibility());
setContentView(R.layout.activity_magic_call); setContentView(R.layout.activity_magic_call);
ButterKnife.bind(this); ButterKnife.bind(this);
router = Conductor.attachRouter(this, container, savedInstanceState); router = Conductor.attachRouter(this, container, savedInstanceState);
router.setPopsLastView(true); router.setPopsLastView(true);
@ -85,10 +86,4 @@ public class MagicCallActivity extends AppCompatActivity {
} }
} }
} }
@Override
public void onBackPressed() {
finish();
}
} }

24
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View File

@ -24,6 +24,7 @@ import android.Manifest;
import android.animation.Animator; import android.animation.Animator;
import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorListenerAdapter;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.res.Configuration;
import android.graphics.Color; import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
@ -414,8 +415,7 @@ public class CallController extends BaseController {
if (isVoiceOnlyCall) { if (isVoiceOnlyCall) {
onMicrophoneClick(); onMicrophoneClick();
} else if (getActivity() != null) { } else if (getActivity() != null) {
EffortlessPermissions.requestPermissions(getActivity(), R.string.nc_permissions, requestPermissions(PERMISSIONS_CALL, 100);
R.string.nc_proceed, R.string.nc_empty, 100, PERMISSIONS_CALL);
} }
} }
@ -472,7 +472,7 @@ public class CallController extends BaseController {
} }
} }
if (getActivity() != null && EffortlessPermissions.hasPermissions(getActivity(), PERMISSIONS_MICROPHONE)) { if (EffortlessPermissions.hasPermissions(getActivity(), PERMISSIONS_MICROPHONE)) {
if (!audioOn) { if (!audioOn) {
onMicrophoneClick(); onMicrophoneClick();
} }
@ -634,10 +634,7 @@ public class CallController extends BaseController {
R.string.nc_microphone_permission_permanently_denied, R.string.nc_microphone_permission_permanently_denied,
R.string.nc_permissions_settings, (AppCompatActivity) getActivity()); R.string.nc_permissions_settings, (AppCompatActivity) getActivity());
} else { } else {
if (getActivity() != null) { requestPermissions(PERMISSIONS_MICROPHONE, 100);
EffortlessPermissions.requestPermissions(getActivity(), R.string.nc_permissions_audio,
R.string.nc_proceed, R.string.nc_empty, 100, PERMISSIONS_MICROPHONE);
}
} }
} }
@ -673,10 +670,7 @@ public class CallController extends BaseController {
R.string.nc_camera_permission_permanently_denied, R.string.nc_camera_permission_permanently_denied,
R.string.nc_permissions_settings, (AppCompatActivity) getActivity()); R.string.nc_permissions_settings, (AppCompatActivity) getActivity());
} else { } else {
if (getActivity() != null) { requestPermissions(PERMISSIONS_CAMERA, 100);
EffortlessPermissions.requestPermissions(getActivity(), R.string.nc_permissions_video,
R.string.nc_proceed, R.string.nc_empty, 100, PERMISSIONS_CAMERA);
}
} }
} }
@ -1406,8 +1400,10 @@ public class CallController extends BaseController {
} }
} }
if (callControls != null) {
callControls.setZ(100.0f); callControls.setZ(100.0f);
} }
}
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void onMessageEvent(MediaStreamEvent mediaStreamEvent) { public void onMessageEvent(MediaStreamEvent mediaStreamEvent) {
@ -1629,6 +1625,12 @@ public class CallController extends BaseController {
protected void onAttach(@NonNull View view) { protected void onAttach(@NonNull View view) {
super.onAttach(view); super.onAttach(view);
eventBus.register(this); eventBus.register(this);
if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
remoteRenderersLayout.setOrientation(LinearLayout.HORIZONTAL);
} else if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
remoteRenderersLayout.setOrientation(LinearLayout.VERTICAL);
}
} }
@Override @Override