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
269
Issues
269
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
9f559085
Commit
9f559085
authored
Mar 23, 2017
by
Bastien Le Querrec
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
generate missing keys only if DB upgrade is done
parent
a03a0595
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
4 deletions
+18
-4
src/org/smssecure/smssecure/util/VersionTracker.java
src/org/smssecure/smssecure/util/VersionTracker.java
+15
-2
src/org/smssecure/smssecure/util/dualsim/DualSimUtil.java
src/org/smssecure/smssecure/util/dualsim/DualSimUtil.java
+1
-1
src/org/smssecure/smssecure/util/dualsim/SimChangedReceiver.java
.../smssecure/smssecure/util/dualsim/SimChangedReceiver.java
+2
-1
No files found.
src/org/smssecure/smssecure/util/VersionTracker.java
View file @
9f559085
package
org.smssecure.smssecure.util
;
import
android.content.Context
;
import
android.content.pm.PackageManager
;
import
android.content.pm.PackageInfo
;
import
android.util.Log
;
import
java.io.IOException
;
public
class
VersionTracker
{
private
static
final
String
TAG
=
VersionTracker
.
class
.
getSimpleName
();
public
static
int
getLastSeenVersion
(
Context
context
)
{
return
SilencePreferences
.
getLastVersionCode
(
context
);
...
...
@@ -20,4 +21,16 @@ public class VersionTracker {
throw
new
AssertionError
(
ioe
);
}
}
public
static
boolean
isDbUpdated
(
Context
context
)
{
try
{
PackageInfo
packageInfo
=
context
.
getPackageManager
().
getPackageInfo
(
context
.
getPackageName
(),
0
);
if
(
packageInfo
==
null
)
return
true
;
return
SilencePreferences
.
getLastVersionCode
(
context
)
>=
packageInfo
.
versionCode
;
}
catch
(
Exception
e
)
{
Log
.
w
(
TAG
,
e
);
return
true
;
}
}
}
src/org/smssecure/smssecure/util/dualsim/DualSimUtil.java
View file @
9f559085
...
...
@@ -122,7 +122,7 @@ public class DualSimUtil {
.
setStyle
(
new
NotificationCompat
.
BigTextStyle
().
bigText
(
context
.
getString
(
R
.
string
.
DualSimUtil__a_new_key_has_been_generated_for_that_new_sim_card
)))
.
setAutoCancel
(
true
)
.
setVisibility
(
Notification
.
VISIBILITY_PUBLIC
)
.
setContentIntent
(
PendingIntent
.
getActivity
(
context
,
0
,
.
setContentIntent
(
PendingIntent
.
getActivity
(
context
.
getApplicationContext
()
,
0
,
targetIntent
,
PendingIntent
.
FLAG_UPDATE_CURRENT
))
.
build
();
...
...
src/org/smssecure/smssecure/util/dualsim/SimChangedReceiver.java
View file @
9f559085
...
...
@@ -10,6 +10,7 @@ import android.util.Log;
import
org.smssecure.smssecure.ApplicationContext
;
import
org.smssecure.smssecure.util.SilencePreferences
;
import
org.smssecure.smssecure.util.VersionTracker
;
import
org.smssecure.smssecure.jobs.GenerateKeysJob
;
import
java.util.Arrays
;
...
...
@@ -30,7 +31,7 @@ public class SimChangedReceiver extends BroadcastReceiver {
}
public
static
void
checkSimState
(
final
Context
context
)
{
if
(
hasDifferentSubscriptions
(
context
))
{
if
(
hasDifferentSubscriptions
(
context
)
&&
VersionTracker
.
isDbUpdated
(
context
)
)
{
ApplicationContext
.
getInstance
(
context
)
.
getJobManager
()
.
add
(
new
GenerateKeysJob
(
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