Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Silence-Android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
270
Issues
270
List
Boards
Labels
Service Desk
Milestones
Merge Requests
11
Merge Requests
11
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Silence
Silence-Android
Commits
3d65239e
Commit
3d65239e
authored
Apr 17, 2020
by
Bastien Le Querrec
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
start secure session from the current subscription only
parent
c3e95e45
Pipeline
#165
failed with stages
in 39 minutes and 29 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
12 deletions
+1
-12
src/org/smssecure/smssecure/ConversationItem.java
src/org/smssecure/smssecure/ConversationItem.java
+1
-1
src/org/smssecure/smssecure/crypto/KeyExchangeInitiator.java
src/org/smssecure/smssecure/crypto/KeyExchangeInitiator.java
+0
-11
No files found.
src/org/smssecure/smssecure/ConversationItem.java
View file @
3d65239e
...
...
@@ -519,7 +519,7 @@ public class ConversationItem extends LinearLayout
builder
.
setPositiveButton
(
R
.
string
.
yes
,
new
DialogInterface
.
OnClickListener
()
{
@Override
public
void
onClick
(
DialogInterface
dialog
,
int
which
)
{
KeyExchangeInitiator
.
initiate
(
context
,
masterSecret
,
recipients
,
true
);
KeyExchangeInitiator
.
initiate
(
context
,
masterSecret
,
recipients
,
true
,
messageRecord
.
getSubscriptionId
()
);
}
});
builder
.
show
();
...
...
src/org/smssecure/smssecure/crypto/KeyExchangeInitiator.java
View file @
3d65239e
...
...
@@ -56,17 +56,6 @@ public class KeyExchangeInitiator {
MessageSender
.
send
(
context
,
masterSecret
,
endSessionMessage
,
-
1
,
false
);
}
public
static
void
initiate
(
final
Context
context
,
final
MasterSecret
masterSecret
,
final
Recipients
recipients
,
boolean
promptOnExisting
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
22
)
{
List
<
SubscriptionInfo
>
listSubscriptionInfo
=
SubscriptionManager
.
from
(
context
).
getActiveSubscriptionInfoList
();
for
(
SubscriptionInfo
subscriptionInfo
:
listSubscriptionInfo
)
{
initiate
(
context
,
masterSecret
,
recipients
,
promptOnExisting
,
subscriptionInfo
.
getSubscriptionId
());
}
}
else
{
initiate
(
context
,
masterSecret
,
recipients
,
promptOnExisting
,
-
1
);
}
}
public
static
void
initiate
(
final
Context
context
,
final
MasterSecret
masterSecret
,
final
Recipients
recipients
,
boolean
promptOnExisting
,
final
int
subscriptionId
)
{
if
(
promptOnExisting
&&
hasInitiatedSession
(
context
,
masterSecret
,
recipients
,
subscriptionId
))
{
AlertDialog
.
Builder
dialog
=
new
AlertDialog
.
Builder
(
context
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment