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
briar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
694
Issues
694
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
briar
briar
Commits
e810785f
Verified
Commit
e810785f
authored
Jun 08, 2019
by
akwizgran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Retry database tasks after signing in.
parent
7ec826cc
Pipeline
#3516
passed with stage
in 8 minutes and 30 seconds
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
30 additions
and
14 deletions
+30
-14
bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java
...src/main/java/org/briarproject/bramble/db/H2Database.java
+3
-2
bramble-core/src/main/java/org/briarproject/bramble/db/HyperSqlDatabase.java
...in/java/org/briarproject/bramble/db/HyperSqlDatabase.java
+3
-2
bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java
...c/main/java/org/briarproject/bramble/db/JdbcDatabase.java
+2
-1
briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java
...rg/briarproject/briar/android/activity/BriarActivity.java
+10
-3
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactActivity.java
.../briar/android/contact/add/remote/AddContactActivity.java
+5
-6
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java
...briar/android/contact/add/remote/AddContactViewModel.java
+3
-0
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java
...ndroid/contact/add/remote/PendingContactListActivity.java
+1
-0
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java
...droid/contact/add/remote/PendingContactListViewModel.java
+3
-0
No files found.
bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java
View file @
e810785f
...
...
@@ -2,6 +2,7 @@ package org.briarproject.bramble.db;
import
org.briarproject.bramble.api.crypto.SecretKey
;
import
org.briarproject.bramble.api.db.DatabaseConfig
;
import
org.briarproject.bramble.api.db.DbClosedException
;
import
org.briarproject.bramble.api.db.DbException
;
import
org.briarproject.bramble.api.db.MigrationListener
;
import
org.briarproject.bramble.api.nullsafety.NotNullByDefault
;
...
...
@@ -89,9 +90,9 @@ class H2Database extends JdbcDatabase {
}
@Override
protected
Connection
createConnection
()
throws
SQLException
{
protected
Connection
createConnection
()
throws
DbException
,
SQLException
{
SecretKey
key
=
this
.
key
;
if
(
key
==
null
)
throw
new
IllegalState
Exception
();
if
(
key
==
null
)
throw
new
DbClosed
Exception
();
Properties
props
=
new
Properties
();
props
.
setProperty
(
"user"
,
"user"
);
// Separate the file password from the user password with a space
...
...
bramble-core/src/main/java/org/briarproject/bramble/db/HyperSqlDatabase.java
View file @
e810785f
...
...
@@ -2,6 +2,7 @@ package org.briarproject.bramble.db;
import
org.briarproject.bramble.api.crypto.SecretKey
;
import
org.briarproject.bramble.api.db.DatabaseConfig
;
import
org.briarproject.bramble.api.db.DbClosedException
;
import
org.briarproject.bramble.api.db.DbException
;
import
org.briarproject.bramble.api.db.MigrationListener
;
import
org.briarproject.bramble.api.nullsafety.NotNullByDefault
;
...
...
@@ -87,9 +88,9 @@ class HyperSqlDatabase extends JdbcDatabase {
}
@Override
protected
Connection
createConnection
()
throws
SQLException
{
protected
Connection
createConnection
()
throws
DbException
,
SQLException
{
SecretKey
key
=
this
.
key
;
if
(
key
==
null
)
throw
new
IllegalState
Exception
();
if
(
key
==
null
)
throw
new
DbClosed
Exception
();
String
hex
=
StringUtils
.
toHexString
(
key
.
getBytes
());
return
DriverManager
.
getConnection
(
url
+
";crypt_key="
+
hex
);
}
...
...
bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java
View file @
e810785f
...
...
@@ -347,7 +347,8 @@ abstract class JdbcDatabase implements Database<Connection> {
private int openConnections = 0; // Locking: connectionsLock
private boolean closed = false; // Locking: connectionsLock
protected abstract Connection createConnection() throws SQLException;
protected abstract Connection createConnection()
throws DbException, SQLException;
protected abstract void compactAndClose() throws DbException;
...
...
briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java
View file @
e810785f
...
...
@@ -30,6 +30,7 @@ import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
import
static
android
.
content
.
Intent
.
FLAG_ACTIVITY_NEW_TASK
;
import
static
android
.
content
.
Intent
.
FLAG_ACTIVITY_NO_ANIMATION
;
import
static
android
.
os
.
Build
.
VERSION
.
SDK_INT
;
import
static
java
.
util
.
logging
.
Level
.
INFO
;
import
static
org
.
briarproject
.
briar
.
android
.
activity
.
RequestCodes
.
REQUEST_DOZE_WHITELISTING
;
import
static
org
.
briarproject
.
briar
.
android
.
activity
.
RequestCodes
.
REQUEST_PASSWORD
;
import
static
org
.
briarproject
.
briar
.
android
.
activity
.
RequestCodes
.
REQUEST_UNLOCK
;
...
...
@@ -66,9 +67,15 @@ public abstract class BriarActivity extends BaseActivity {
@Nullable
Intent
data
)
{
super
.
onActivityResult
(
request
,
result
,
data
);
if
(
request
==
REQUEST_PASSWORD
)
{
// We get RESULT_CANCELED when the account gets deleted or
// StartupActivity finishes before entering the password.
if
(
result
==
RESULT_OK
)
briarController
.
startAndBindService
();
// Recreate the activity so any DB tasks that failed before
// signing in can be retried
if
(
result
==
RESULT_OK
)
{
if
(
LOG
.
isLoggable
(
INFO
))
{
LOG
.
info
(
"Recreating "
+
getClass
().
getSimpleName
()
+
" after signing in"
);
}
recreate
();
}
}
else
if
(
request
==
REQUEST_UNLOCK
&&
result
!=
RESULT_OK
)
{
// We arrive here, if the user presses 'back'
// in the Keyguard unlock screen, because UnlockActivity finishes.
...
...
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactActivity.java
View file @
e810785f
...
...
@@ -49,6 +49,7 @@ public class AddContactActivity extends BriarActivity implements
viewModel
=
ViewModelProviders
.
of
(
this
,
viewModelFactory
)
.
get
(
AddContactViewModel
.
class
);
viewModel
.
onCreate
();
viewModel
.
getRemoteLinkEntered
().
observeEvent
(
this
,
entered
->
{
if
(
entered
)
{
NicknameFragment
f
=
new
NicknameFragment
();
...
...
@@ -93,13 +94,11 @@ public class AddContactActivity extends BriarActivity implements
@Override
public
boolean
onOptionsItemSelected
(
MenuItem
item
)
{
switch
(
item
.
getItemId
())
{
case
android
.
R
.
id
.
home
:
onBackPressed
();
return
true
;
default
:
return
super
.
onOptionsItemSelected
(
item
);
if
(
item
.
getItemId
()
==
android
.
R
.
id
.
home
)
{
onBackPressed
();
return
true
;
}
return
super
.
onOptionsItemSelected
(
item
);
}
}
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java
View file @
e810785f
...
...
@@ -53,6 +53,9 @@ public class AddContactViewModel extends AndroidViewModel {
super
(
application
);
this
.
contactManager
=
contactManager
;
this
.
dbExecutor
=
dbExecutor
;
}
void
onCreate
()
{
loadHandshakeLink
();
}
...
...
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListActivity.java
View file @
e810785f
...
...
@@ -55,6 +55,7 @@ public class PendingContactListActivity extends BriarActivity
viewModel
=
ViewModelProviders
.
of
(
this
,
viewModelFactory
)
.
get
(
PendingContactListViewModel
.
class
);
viewModel
.
onCreate
();
viewModel
.
getPendingContacts
()
.
observe
(
this
,
this
::
onPendingContactsChanged
);
...
...
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java
View file @
e810785f
...
...
@@ -61,6 +61,9 @@ public class PendingContactListViewModel extends AndroidViewModel
this
.
rendezvousPoller
=
rendezvousPoller
;
this
.
eventBus
=
eventBus
;
this
.
eventBus
.
addListener
(
this
);
}
void
onCreate
()
{
loadPendingContacts
();
}
...
...
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