Skip to content

Store bridge address protocol #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eligrey wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Store bridge address protocol #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46bb2d9
Store bridge address protocol if entered
eligrey Feb 22, 2016
9a9e2fc
Removed http-prefixing for bridge addresses
eligrey Feb 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions mobile/src/main/java/com/kuxhausen/huemore/net/hue/api/NetworkMethods.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static void preformTransmitPendingState(Route route, String hash, Context
Gson gson = new Gson();

String url =
"http://" + route.address + "/api/" + hash + "/lights/" + pState.hubBulb.getHubBulbNumber()
route.address + "/api/" + hash + "/lights/" + pState.hubBulb.getHubBulbNumber()
+ "/state";

GsonRequest<LightsPutResponse[]> req =
Expand All @@ -45,7 +45,7 @@ public static void PreformGetBulbAttributes(Route route, String hash, Context co
return;
}

String url = "http://" + route.address + "/api/" + hash + "/lights/" + bulb;
String url = route.address + "/api/" + hash + "/lights/" + bulb;

GsonRequest<BulbAttributes> req =
new GsonRequest<BulbAttributes>(Method.GET, url, null, BulbAttributes.class, null,
Expand All @@ -65,7 +65,7 @@ public static void setBulbAttributes(Route route, String hash, Context context,
}

Gson gson = new Gson();
String url = "http://" + route.address + "/api/" + hash + "/lights/" + bulbNum;
String url = route.address + "/api/" + hash + "/lights/" + bulbNum;

GsonRequest<LightsPutResponse[]> req =
new GsonRequest<>(Method.PUT, url, gson.toJson(bulbAtt.getSettableAttributes()),
Expand All @@ -85,7 +85,7 @@ public static void PreformGetBulbList(Route route, String hash, Context context,
return;
}

String url = "http://" + route.address + "/api/" + hash + "/lights";
String url = route.address + "/api/" + hash + "/lights";

GsonRequest<BulbList> req =
new GsonRequest<BulbList>(Method.GET, url, null, BulbList.class, null,
Expand All @@ -112,7 +112,7 @@ public static void PreformRegister(RequestQueue queue,

for (int i = 0; i < bridges.length; i++) {

String url = "http://" + bridges[i].internalipaddress + "/api/";
String url = bridges[i].internalipaddress + "/api/";

GsonRequest<RegistrationResponse[]> req =
new GsonRequest<RegistrationResponse[]>(Method.POST, url, registrationRequest,
Expand Down
15 changes: 13 additions & 2 deletions mobile/src/main/java/com/kuxhausen/huemore/net/hue/ui/ConfigureHubDialogFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,19 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
@Override
public void onClick(DialogInterface dialog, int id) {
HubData hd = new HubData();
hd.localHubAddress = mLocalAddress.getText().toString();
hd.portForwardedAddress = mRemoteAddress.getText().toString();
String localAddress = mLocalAddress.getText().toString();
String remoteAddress = mRemoteAddress.getText().toString();

if (!localAddress.matches("(?i:https?:).*")) {
localAddress = "http://" + localAddress;
}

if (!remoteAddress.matches("(?i:https?:).*")) {
remoteAddress = "http://" + remoteAddress;
}

hd.localHubAddress = localAddress;
hd.portForwardedAddress = remoteAddress;

if (mPriorConnection != null) {
hd.hashedUsername = mPriorConnection.getHubData().hashedUsername;
Expand Down