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
100c71e5
Commit
100c71e5
authored
Mar 30, 2017
by
Bastien Le Querrec
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix crash if no SIM card is inserted
parent
e36f6846
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
1 deletion
+31
-1
res/values/strings.xml
res/values/strings.xml
+4
-0
src/org/smssecure/smssecure/ConversationActivity.java
src/org/smssecure/smssecure/ConversationActivity.java
+4
-0
src/org/smssecure/smssecure/TransportOption.java
src/org/smssecure/smssecure/TransportOption.java
+1
-0
src/org/smssecure/smssecure/TransportOptions.java
src/org/smssecure/smssecure/TransportOptions.java
+13
-1
src/org/smssecure/smssecure/util/DummyCharacterCalculator.java
...rg/smssecure/smssecure/util/DummyCharacterCalculator.java
+9
-0
No files found.
res/values/strings.xml
View file @
100c71e5
...
...
@@ -371,6 +371,10 @@
<string
name=
"ThreadRecord_draft"
>
Draft:
</string>
<string
name=
"ThreadRecord_media_message"
>
Media message
</string>
<!-- TransportOptions -->
<string
name=
"TransportOptions_sms_disabled"
>
SMS messages disabled
</string>
<string
name=
"TransportOptions_no_sim_card_found"
>
No SIM card found
</string>
<!-- VerifyIdentityActivity -->
<string
name=
"VerifyIdentityActivity_you_do_not_have_an_identity_key"
>
You do not have an identity key.
</string>
<string
name=
"VerifyIdentityActivity_recipient_has_no_identity_key"
>
Recipient has no identity key.
</string>
...
...
src/org/smssecure/smssecure/ConversationActivity.java
View file @
100c71e5
...
...
@@ -1300,6 +1300,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}
private
void
sendMessage
()
{
TransportOption
transportOption
=
sendButton
.
getSelectedTransport
();
if
(
transportOption
==
null
||
transportOption
.
getType
()
==
Type
.
DISABLED
)
return
;
try
{
Recipients
recipients
=
getRecipients
();
...
...
src/org/smssecure/smssecure/TransportOption.java
View file @
100c71e5
...
...
@@ -12,6 +12,7 @@ import org.whispersystems.libsignal.util.guava.Optional;
public
class
TransportOption
{
public
enum
Type
{
DISABLED
,
INSECURE_SMS
,
SECURE_SMS
}
...
...
src/org/smssecure/smssecure/TransportOptions.java
View file @
100c71e5
...
...
@@ -8,6 +8,7 @@ import android.support.annotation.Nullable;
import
org.smssecure.smssecure.permissions.Permissions
;
import
org.smssecure.smssecure.util.CharacterCalculator
;
import
org.smssecure.smssecure.util.DummyCharacterCalculator
;
import
org.smssecure.smssecure.util.MmsCharacterCalculator
;
import
org.smssecure.smssecure.util.SmsCharacterCalculator
;
import
org.smssecure.smssecure.util.EncryptedSmsCharacterCalculator
;
...
...
@@ -99,7 +100,7 @@ public class TransportOptions {
}
}
throw
new
AssertionError
(
"No options of default type!"
);
return
getDefaultTransportOption
(
);
}
public
void
disableTransport
(
Type
type
)
{
...
...
@@ -220,4 +221,15 @@ public class TransportOptions {
public
interface
OnTransportChangedListener
{
public
void
onChange
(
TransportOption
newTransport
,
boolean
manuallySelected
);
}
private
TransportOption
getDefaultTransportOption
()
{
return
new
TransportOption
(
Type
.
DISABLED
,
R
.
drawable
.
ic_send_insecure_white_24dp
,
context
.
getResources
().
getColor
(
R
.
color
.
grey_600
),
context
.
getString
(
R
.
string
.
TransportOptions_sms_disabled
),
context
.
getString
(
R
.
string
.
TransportOptions_no_sim_card_found
),
new
DummyCharacterCalculator
(),
Optional
.
of
((
CharSequence
)
""
),
Optional
.
of
(-
1
));
}
}
src/org/smssecure/smssecure/util/DummyCharacterCalculator.java
0 → 100644
View file @
100c71e5
package
org.smssecure.smssecure.util
;
public
class
DummyCharacterCalculator
extends
CharacterCalculator
{
@Override
public
CharacterState
calculateCharacters
(
String
messageBody
)
{
return
new
CharacterState
(
0
,
0
,
0
);
}
}
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