Skip to content
This repository has been archived by the owner on Jun 17, 2022. It is now read-only.

Commit

Permalink
version update
Browse files Browse the repository at this point in the history
  • Loading branch information
@sytolk
sytolk committed Aug 10, 2016
1 parent 8be094d commit fc5aee5
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 54 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ android {
applicationId "com.opentaxi.android"
minSdkVersion 14
targetSdkVersion 23
versionCode 43
versionCode 44
versionName "1.0.44"
vectorDrawables.useSupportLibrary = true

Expand Down
105 changes: 53 additions & 52 deletions src/main/java/com/opentaxi/android/fragments/ServersFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import org.androidannotations.annotations.*;
import org.androidannotations.api.BackgroundExecutor;

import java.io.IOException;
import java.util.Arrays;
import java.util.List;

Expand Down Expand Up @@ -50,64 +49,66 @@ void scheduleTimeoutCheck() {
@UiThread
void showServers(boolean testing) {
//Log.i(TAG, "showServers testing:" + testing);
serversContent.removeAllViews();

List<Servers> sockets = RestClient.getInstance().getSockets();
String currSocket = RestClient.getInstance().getCurrentSocket();

final RadioButton[] rb = new RadioButton[sockets.size()];
RadioGroup rg = new RadioGroup(mActivity); //create the RadioGroup
rg.setOrientation(RadioGroup.VERTICAL);
int i = 0;
for (final Servers server : sockets) {
if (server.getDescription() != null) {
//Log.i(TAG, socket.getServerHost() + " " + socket.getDescription());
if (server.getDescription().toLowerCase().contains("cloud")) {
if (!isAdmin()) continue;
} //else Log.i(TAG, "not contains " + socket.getDescription());

rb[i] = new RadioButton(mActivity);
rg.addView(rb[i]); //the RadioButtons are added to the radioGroup instead of the layout

//CheckBox ch = new CheckBox(this);
StringBuilder title = new StringBuilder();
title.append(server.getDescription()).append(" "); //.append(socket.getServerHost());
if (server.getRecordstatus()) {
title.append("UP");
rb[i].setBackgroundColor(ContextCompat.getColor(mActivity, R.color.label_color));
} else {
title.append("DOWN");
rb[i].setBackgroundColor(ContextCompat.getColor(mActivity, R.color.red_color));
}
rb[i].setText(title.toString());
if (serversContent != null) {
serversContent.removeAllViews();

List<Servers> sockets = RestClient.getInstance().getSockets();
String currSocket = RestClient.getInstance().getCurrentSocket();

final RadioButton[] rb = new RadioButton[sockets.size()];
RadioGroup rg = new RadioGroup(mActivity); //create the RadioGroup
rg.setOrientation(RadioGroup.VERTICAL);
int i = 0;
for (final Servers server : sockets) {
if (server.getDescription() != null) {
//Log.i(TAG, socket.getServerHost() + " " + socket.getDescription());
if (server.getDescription().toLowerCase().contains("cloud")) {
if (!isAdmin()) continue;
} //else Log.i(TAG, "not contains " + socket.getDescription());

rb[i] = new RadioButton(mActivity);
rg.addView(rb[i]); //the RadioButtons are added to the radioGroup instead of the layout

//CheckBox ch = new CheckBox(this);
StringBuilder title = new StringBuilder();
title.append(server.getDescription()).append(" "); //.append(socket.getServerHost());
if (server.getRecordstatus()) {
title.append("UP");
rb[i].setBackgroundColor(ContextCompat.getColor(mActivity, R.color.label_color));
} else {
title.append("DOWN");
rb[i].setBackgroundColor(ContextCompat.getColor(mActivity, R.color.red_color));
}
rb[i].setText(title.toString());

String hostSecure = server.getServerDomain() + (server.getSecurePort() != null ? ":" + server.getSecurePort() : "");
String host = server.getServerDomain() + (server.getServerPort() != null ? ":" + server.getServerPort() : "");
String hostSecure = server.getServerDomain() + (server.getSecurePort() != null ? ":" + server.getSecurePort() : "");
String host = server.getServerDomain() + (server.getServerPort() != null ? ":" + server.getServerPort() : "");

if (currSocket.equals(hostSecure) || currSocket.equals(host) || currSocket.equals(server.getServerHost())) {
rb[i].setChecked(true);
}
if (currSocket.equals(hostSecure) || currSocket.equals(host) || currSocket.equals(server.getServerHost())) {
rb[i].setChecked(true);
}

rb[i].setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Integer oldType = AppPreferences.getInstance(mActivity).getSocketType();
AppPreferences.getInstance(mActivity).setSocketType(server.getServerType());
if (RestClient.getInstance().changeServerSockets(server)) {
if (oldType == null || !oldType.equals(server.getServerType())) login();
showServers(false);
rb[i].setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Integer oldType = AppPreferences.getInstance(mActivity).getSocketType();
AppPreferences.getInstance(mActivity).setSocketType(server.getServerType());
if (RestClient.getInstance().changeServerSockets(server)) {
if (oldType == null || !oldType.equals(server.getServerType())) login();
showServers(false);
}
}
}
});
});

if (testing && server.getServerType().equals(AppPreferences.getInstance(mActivity).getSocketType()))
testServer(server.getServerHost());
if (testing && server.getServerType().equals(AppPreferences.getInstance(mActivity).getSocketType()))
testServer(server.getServerHost());

i++;
i++;
}
}
serversContent.addView(rg);
scheduleTimeoutCheck();
}
serversContent.addView(rg);
scheduleTimeoutCheck();
//serversContent.invalidate();
}

Expand All @@ -132,7 +133,7 @@ private boolean isAdmin() {
if (usersGroup != null) {
if (Arrays.asList(usersGroup).contains(UsersGroupEnum.ADMINISTRATORS.getCode())) return true;
}
} catch (JsonSyntaxException e){//IOException e) {
} catch (JsonSyntaxException e) {//IOException e) {
e.printStackTrace();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/opentaxi/android/gcm/GCMRegisterService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ protected void onHandleIntent(Intent intent) {
if (success != null && !success) {
TaxiApplication.setGCMRegistrationId(token);
Log.e("GCMRegisterService", "gcm not registered on server regId:" + token);
} else Log.i("GCMRegisterService", "gcm registered regId:" + token);
} //else Log.i("GCMRegisterService", "gcm registered regId:" + token);
}
} else Log.i("GCMRegisterService", "not loged in");
} catch (IOException e) {
Expand Down

0 comments on commit fc5aee5

Please sign in to comment.