mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-21 19:55:07 +01:00
Fix rotation
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
parent
d3e603a5ce
commit
66903b77db
@ -138,7 +138,7 @@ dependencies {
|
|||||||
implementation 'com.yarolegovich:lovelyinput:1.0.2'
|
implementation 'com.yarolegovich:lovelyinput:1.0.2'
|
||||||
implementation 'com.yarolegovich:mp:1.0.8'
|
implementation 'com.yarolegovich:mp:1.0.8'
|
||||||
|
|
||||||
compile 'gun0912.ted:tedpermission:2.0.3'
|
compile 'ru.alexbykov:nopermission:1.1.1'
|
||||||
|
|
||||||
testImplementation 'junit:junit:4.12'
|
testImplementation 'junit:junit:4.12'
|
||||||
androidTestImplementation ('com.android.support.test.espresso:espresso-core:3.0.1', {
|
androidTestImplementation ('com.android.support.test.espresso:espresso-core:3.0.1', {
|
||||||
|
@ -33,8 +33,6 @@ import android.view.View;
|
|||||||
import android.view.Window;
|
import android.view.Window;
|
||||||
import android.view.WindowManager;
|
import android.view.WindowManager;
|
||||||
|
|
||||||
import com.gun0912.tedpermission.PermissionListener;
|
|
||||||
import com.gun0912.tedpermission.TedPermission;
|
|
||||||
import com.nextcloud.talk.R;
|
import com.nextcloud.talk.R;
|
||||||
import com.nextcloud.talk.application.NextcloudTalkApplication;
|
import com.nextcloud.talk.application.NextcloudTalkApplication;
|
||||||
import com.nextcloud.talk.webrtc.MagicPeerConnectionObserver;
|
import com.nextcloud.talk.webrtc.MagicPeerConnectionObserver;
|
||||||
@ -64,6 +62,7 @@ import java.util.List;
|
|||||||
import autodagger.AutoInjector;
|
import autodagger.AutoInjector;
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
|
import ru.alexbykov.nopermission.PermissionHelper;
|
||||||
|
|
||||||
@AutoInjector(NextcloudTalkApplication.class)
|
@AutoInjector(NextcloudTalkApplication.class)
|
||||||
public class CallActivity extends AppCompatActivity {
|
public class CallActivity extends AppCompatActivity {
|
||||||
@ -111,34 +110,28 @@ public class CallActivity extends AppCompatActivity {
|
|||||||
roomToken = getIntent().getExtras().getString("roomToken", "");
|
roomToken = getIntent().getExtras().getString("roomToken", "");
|
||||||
userDisplayName = getIntent().getExtras().getString("userDisplayName", "");
|
userDisplayName = getIntent().getExtras().getString("userDisplayName", "");
|
||||||
|
|
||||||
|
|
||||||
PermissionListener permissionlistener = new PermissionListener() {
|
|
||||||
@Override
|
|
||||||
public void onPermissionGranted() {
|
|
||||||
start();
|
|
||||||
call();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onPermissionDenied(ArrayList<String> deniedPermissions) {
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
initViews();
|
initViews();
|
||||||
|
|
||||||
TedPermission.with(this)
|
PermissionHelper permissionHelper = new PermissionHelper(this);
|
||||||
.setPermissionListener(permissionlistener)
|
permissionHelper.check(android.Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO,
|
||||||
.setDeniedMessage("If you reject permission,you can not use this service\n\nPlease turn on permissions at [Setting] > [Permission]")
|
Manifest.permission.MODIFY_AUDIO_SETTINGS, Manifest.permission.ACCESS_NETWORK_STATE,
|
||||||
.setPermissions(android.Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO,
|
Manifest.permission.ACCESS_WIFI_STATE, Manifest.permission.INTERNET)
|
||||||
Manifest.permission.MODIFY_AUDIO_SETTINGS, Manifest.permission.ACCESS_NETWORK_STATE,
|
.onSuccess(() -> {
|
||||||
Manifest.permission.ACCESS_WIFI_STATE, Manifest.permission.INTERNET)
|
start();
|
||||||
.check();
|
call();
|
||||||
|
})
|
||||||
|
.onDenied(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
// do nothing
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.run();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private VideoCapturer createVideoCapturer() {
|
private VideoCapturer createVideoCapturer() {
|
||||||
videoCapturer = createCameraCapturer(new Camera1Enumerator(false));
|
videoCapturer = createCameraCapturer(new Camera1Enumerator(false));
|
||||||
return videoCapturer;
|
return videoCapturer;
|
||||||
|
Loading…
Reference in New Issue
Block a user