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
interferometer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
akwizgran
interferometer
Commits
43c7d2cb
Commit
43c7d2cb
authored
Feb 06, 2020
by
akwizgran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add service discovery test.
parent
6ad3a303
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
124 additions
and
61 deletions
+124
-61
app/src/main/java/org/briarproject/interferometer/MainActivity.java
...in/java/org/briarproject/interferometer/MainActivity.java
+6
-3
app/src/main/java/org/briarproject/interferometer/MainViewModel.java
...n/java/org/briarproject/interferometer/MainViewModel.java
+93
-48
app/src/main/java/org/briarproject/interferometer/ResultsDialogFragment.java
...rg/briarproject/interferometer/ResultsDialogFragment.java
+13
-6
app/src/main/res/layout/dialog_results.xml
app/src/main/res/layout/dialog_results.xml
+7
-1
app/src/main/res/values/strings.xml
app/src/main/res/values/strings.xml
+5
-3
No files found.
app/src/main/java/org/briarproject/interferometer/MainActivity.java
View file @
43c7d2cb
...
...
@@ -24,8 +24,9 @@ import static org.briarproject.interferometer.MainViewModel.StartResult.NO_BLUET
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
TestPhase
.
BT_DISABLED
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
TestPhase
.
BT_ENABLED
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
TestPhase
.
CONNECTIONS
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
TestPhase
.
DISCOVERY
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
TestPhase
.
D
EVICE_D
ISCOVERY
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
TestPhase
.
READY
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
TestPhase
.
SERVICE_DISCOVERY
;
import
static
org
.
briarproject
.
interferometer
.
Utils
.
formatSpeed
;
public
class
MainActivity
extends
AppCompatActivity
{
...
...
@@ -88,8 +89,10 @@ public class MainActivity extends AppCompatActivity {
testPhaseTextView
.
setText
(
R
.
string
.
testing_bt_disabled
);
}
else
if
(
phase
==
BT_ENABLED
)
{
testPhaseTextView
.
setText
(
R
.
string
.
testing_bt_enabled
);
}
else
if
(
phase
==
DISCOVERY
)
{
testPhaseTextView
.
setText
(
R
.
string
.
testing_discovery
);
}
else
if
(
phase
==
DEVICE_DISCOVERY
)
{
testPhaseTextView
.
setText
(
R
.
string
.
testing_device_discovery
);
}
else
if
(
phase
==
SERVICE_DISCOVERY
)
{
testPhaseTextView
.
setText
(
R
.
string
.
testing_service_discovery
);
}
else
if
(
phase
==
CONNECTIONS
)
{
testPhaseTextView
.
setText
(
R
.
string
.
testing_connections
);
}
...
...
app/src/main/java/org/briarproject/interferometer/MainViewModel.java
View file @
43c7d2cb
This diff is collapsed.
Click to expand it.
app/src/main/java/org/briarproject/interferometer/ResultsDialogFragment.java
View file @
43c7d2cb
...
...
@@ -14,13 +14,15 @@ import androidx.fragment.app.DialogFragment;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
CONSUMED
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
DOWNLOAD_CONNECTIONS
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
DOWNLOAD_DEVICE_DISCOVERY
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
DOWNLOAD_DISABLED
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
DOWNLOAD_DISCOVERY
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
DOWNLOAD_ENABLED
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
DOWNLOAD_SERVICE_DISCOVERY
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
UPLOAD_CONNECTIONS
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
UPLOAD_DEVICE_DISCOVERY
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
UPLOAD_DISABLED
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
UPLOAD_DISCOVERY
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
UPLOAD_ENABLED
;
import
static
org
.
briarproject
.
interferometer
.
MainViewModel
.
UPLOAD_SERVICE_DISCOVERY
;
import
static
org
.
briarproject
.
interferometer
.
Utils
.
formatSpeed
;
public
class
ResultsDialogFragment
extends
DialogFragment
{
...
...
@@ -51,10 +53,15 @@ public class ResultsDialogFragment extends DialogFragment {
formatSpeed
(
args
.
getDouble
(
DOWNLOAD_ENABLED
)),
formatSpeed
(
args
.
getDouble
(
UPLOAD_ENABLED
))));
TextView
discovery
=
v
.
findViewById
(
R
.
id
.
discovery
);
discovery
.
setText
(
getString
(
R
.
string
.
results_format_discovery
,
formatSpeed
(
args
.
getDouble
(
DOWNLOAD_DISCOVERY
)),
formatSpeed
(
args
.
getDouble
(
UPLOAD_DISCOVERY
))));
TextView
deviceDiscovery
=
v
.
findViewById
(
R
.
id
.
device_discovery
);
deviceDiscovery
.
setText
(
getString
(
R
.
string
.
results_format_device_discovery
,
formatSpeed
(
args
.
getDouble
(
DOWNLOAD_DEVICE_DISCOVERY
)),
formatSpeed
(
args
.
getDouble
(
UPLOAD_DEVICE_DISCOVERY
))));
TextView
serviceDiscovery
=
v
.
findViewById
(
R
.
id
.
service_discovery
);
serviceDiscovery
.
setText
(
getString
(
R
.
string
.
results_format_service_discovery
,
formatSpeed
(
args
.
getDouble
(
DOWNLOAD_SERVICE_DISCOVERY
)),
formatSpeed
(
args
.
getDouble
(
UPLOAD_SERVICE_DISCOVERY
))));
TextView
connections
=
v
.
findViewById
(
R
.
id
.
connections
);
connections
.
setText
(
getString
(
R
.
string
.
results_format_connections
,
...
...
app/src/main/res/layout/dialog_results.xml
View file @
43c7d2cb
...
...
@@ -18,7 +18,13 @@
android:layout_marginBottom=
"8dp"
/>
<TextView
android:id=
"@+id/discovery"
android:id=
"@+id/device_discovery"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"8dp"
/>
<TextView
android:id=
"@+id/service_discovery"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"8dp"
/>
...
...
app/src/main/res/values/strings.xml
View file @
43c7d2cb
...
...
@@ -11,8 +11,9 @@
<string
name=
"testing_bt_disabled"
>
Testing with Bluetooth disabled
</string>
<string
name=
"testing_bt_enabled"
>
Testing with Bluetooth enabled
</string>
<string
name=
"testing_discovery"
>
Testing with Bluetooth discovery
</string>
<string
name=
"testing_connections"
>
Testing with Bluetooth connections
</string>
<string
name=
"testing_device_discovery"
>
Testing with device discovery
</string>
<string
name=
"testing_service_discovery"
>
Testing with service discovery
</string>
<string
name=
"testing_connections"
>
Testing with connections
</string>
<string
name=
"download_format"
>
Download: %s
</string>
<string
name=
"upload_format"
>
Upload: %s
</string>
...
...
@@ -20,6 +21,7 @@
<string
name=
"results_title"
>
Wi-Fi Throughput
</string>
<string
name=
"results_format_bt_disabled"
>
BT disabled: %s down, %s up
</string>
<string
name=
"results_format_bt_enabled"
>
BT enabled: %s down, %s up
</string>
<string
name=
"results_format_discovery"
>
Discovery: %s down, %s up
</string>
<string
name=
"results_format_device_discovery"
>
Device discovery: %s down, %s up
</string>
<string
name=
"results_format_service_discovery"
>
Service discovery: %s down, %s up
</string>
<string
name=
"results_format_connections"
>
Connections: %s down, %s up
</string>
</resources>
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