Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
briar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julian Dehm
briar
Commits
e39a74bd
Unverified
Commit
e39a74bd
authored
9 years ago
by
akwizgran
Browse files
Options
Downloads
Patches
Plain Diff
Finish SplashScreenActivity when starting next activity.
Fixes #270.
parent
d605e1ca
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
briar-android/src/org/briarproject/android/SplashScreenActivity.java
+2
-7
2 additions, 7 deletions
...id/src/org/briarproject/android/SplashScreenActivity.java
with
2 additions
and
7 deletions
briar-android/src/org/briarproject/android/SplashScreenActivity.java
+
2
−
7
View file @
e39a74bd
...
...
@@ -15,7 +15,6 @@ import org.briarproject.R;
import
org.briarproject.android.util.AndroidUtils
;
import
org.briarproject.android.util.LayoutUtils
;
import
org.briarproject.api.db.DatabaseConfig
;
import
org.briarproject.util.FileUtils
;
import
java.util.logging.Logger
;
...
...
@@ -34,12 +33,8 @@ public class SplashScreenActivity extends BaseActivity {
// This build expires on 1 April 2016
private
static
final
long
EXPIRY_DATE
=
1459465200
*
1000L
;
private
long
now
=
System
.
currentTimeMillis
();
@Inject
DatabaseConfig
dbConfig
;
protected
DatabaseConfig
dbConfig
;
public
SplashScreenActivity
()
{
Logger
.
getLogger
(
""
).
setLevel
(
DEFAULT_LOG_LEVEL
);
...
...
@@ -70,6 +65,7 @@ public class SplashScreenActivity extends BaseActivity {
@Override
public
void
run
()
{
startNextActivity
();
finish
();
}
},
500
);
}
...
...
@@ -85,7 +81,6 @@ public class SplashScreenActivity extends BaseActivity {
startActivity
(
new
Intent
(
this
,
ExpiredActivity
.
class
));
}
else
{
String
hex
=
getEncryptedDatabaseKey
();
if
(
hex
!=
null
&&
dbConfig
.
databaseExists
())
{
startActivity
(
new
Intent
(
this
,
NavDrawerActivity
.
class
));
}
else
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment