Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

hotspot
- Activity
- Members
- Labels
- Releases
- Model registry
- Model experiments

Snippets Groups Projects

30c2ea20

Commit 30c2ea20 authored 4 years ago by akwizgran

Downloads
- Plain Diff

Merge branch 'use-p2p-address' into 'master'

Add fragment for network interfaces und use address if p2p interface, if available

See merge request !2

parents eaddc3c9 8acf8f14

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/org/briarproject/hotspot/InterfacesFragment.java 28 additions, 0 deletions

...ain/java/org/briarproject/hotspot/InterfacesFragment.java
app/src/main/java/org/briarproject/hotspot/NetworkUtils.java 55 additions, 0 deletions

app/src/main/java/org/briarproject/hotspot/NetworkUtils.java
app/src/main/java/org/briarproject/hotspot/ServerFragment.java 35 additions, 7 deletions

...rc/main/java/org/briarproject/hotspot/ServerFragment.java
app/src/main/res/layout/fragment_interfaces.xml 8 additions, 0 deletions

app/src/main/res/layout/fragment_interfaces.xml
app/src/main/res/menu/main.xml 8 additions, 0 deletions

app/src/main/res/menu/main.xml
app/src/main/res/values/strings.xml 1 addition, 0 deletions

app/src/main/res/values/strings.xml

with 135 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment