Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/iNPUTmice/Conversations.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2022-07-22 11:08:23 +0300
committerDaniel Gultsch <daniel@gultsch.de>2022-07-22 11:08:23 +0300
commit9b04e71e16e113a044fb51393e35b85dbd09db1d (patch)
tree2c1c95f26c1b846979a47328fd6aea83fd8de310
parentcadee7f3cc863f436fbac413b3ccf6d66f306de8 (diff)
leave todos in codefeature_target_32
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationFragment.java2
-rw-r--r--src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 2eb602257..902028369 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1361,6 +1361,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
Toast.makeText(activity, R.string.disable_tor_to_make_call, Toast.LENGTH_SHORT).show();
return;
}
+ //TODO ask for bluetooth_connect
if (hasPermissions(REQUEST_START_AUDIO_CALL, Manifest.permission.RECORD_AUDIO)) {
triggerRtpSession(RtpSessionActivity.ACTION_MAKE_VOICE_CALL);
}
@@ -1371,6 +1372,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
Toast.makeText(activity, R.string.disable_tor_to_make_call, Toast.LENGTH_SHORT).show();
return;
}
+ //TODO ask for bluetooth_connect
if (hasPermissions(REQUEST_START_VIDEO_CALL, Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)) {
triggerRtpSession(RtpSessionActivity.ACTION_MAKE_VIDEO_CALL);
}
diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
index 0e286c8dc..bf6b1283a 100644
--- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
@@ -279,6 +279,7 @@ public class RtpSessionActivity extends XmppActivity
} else {
permissions = ImmutableList.of(Manifest.permission.RECORD_AUDIO);
}
+ //TODO ask for bt connect
if (PermissionUtils.hasPermission(this, permissions, REQUEST_ACCEPT_CALL)) {
putScreenInCallMode();
checkRecorderAndAcceptCall();
@@ -503,6 +504,7 @@ public class RtpSessionActivity extends XmppActivity
} else if (Manifest.permission.CAMERA.equals(firstDenied)) {
res = R.string.no_camera_permission;
} else {
+ //TODO ignore bluetooth_connect denial
throw new IllegalStateException("Invalid permission result request");
}
Toast.makeText(this, getString(res, getString(R.string.app_name)), Toast.LENGTH_SHORT)