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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julian Dehm
briar
Commits
8fffc93b
Commit
8fffc93b
authored
Nov 12, 2012
by
akwizgran
Browse files
Options
Downloads
Patches
Plain Diff
Rewrote Android invitation wizard to use Views instead of Activities.
parent
538c3e1b
No related branches found
No related tags found
No related merge requests found
Changes
42
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
+4
-4
4 additions, 4 deletions
src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
src/net/sf/briar/transport/ConnectionWriterImpl.java
+1
-1
1 addition, 1 deletion
src/net/sf/briar/transport/ConnectionWriterImpl.java
with
5 additions
and
5 deletions
src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
+
4
−
4
View file @
8fffc93b
...
...
@@ -349,10 +349,10 @@ class DroidtoothPlugin implements DuplexPlugin {
if
(!
running
)
return
;
}
if
(
adapter
.
getScanMode
()
==
SCAN_MODE_CONNECTABLE_DISCOVERABLE
)
return
;
Intent
i
ntent
=
new
Intent
(
ACTION_REQUEST_DISCOVERABLE
);
i
ntent
.
putExtra
(
EXTRA_DISCOVERABLE_DURATION
,
6
0
);
i
ntent
.
addFlags
(
FLAG_ACTIVITY_NEW_TASK
);
appContext
.
startActivity
(
i
ntent
);
Intent
i
=
new
Intent
(
ACTION_REQUEST_DISCOVERABLE
);
i
.
putExtra
(
EXTRA_DISCOVERABLE_DURATION
,
12
0
);
i
.
addFlags
(
FLAG_ACTIVITY_NEW_TASK
);
appContext
.
startActivity
(
i
);
}
private
static
class
BluetoothStateReceiver
extends
BroadcastReceiver
{
...
...
...
...
This diff is collapsed.
Click to expand it.
src/net/sf/briar/transport/ConnectionWriterImpl.java
+
1
−
1
View file @
8fffc93b
...
...
@@ -11,7 +11,7 @@ import net.sf.briar.api.transport.ConnectionWriter;
/**
* A ConnectionWriter that buffers its input and writes a frame whenever there
* is a full frame to write or the flush() method is called.
* is a full frame to write or the
{@link #
flush()
}
method is called.
* <p>
* This class is not thread-safe.
*/
...
...
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
3
Next
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