Skip to content

Commit

Permalink
refix ident and mix else if
Browse files Browse the repository at this point in the history
  • Loading branch information
@Chrysweel
Chrysweel committed Apr 6, 2016
1 parent 1685649 commit ca8a21e
Show file tree
Hide file tree
Showing 7 changed files with 99 additions and 190 deletions.
22 changes: 9 additions & 13 deletions app/src/main/java/org/yaaic/activity/AddAliasActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,19 +76,15 @@ public void onClick(View v)
adapter.add(alias);
aliasInput.setText("");
okButton.setEnabled(true);
} else {
if(id == R.id.cancel) {
setResult(RESULT_CANCELED);
finish();
} else {
if(id == R.id.ok) {
// Get list and return as result
Intent intent = new Intent();
intent.putExtra(Extra.ALIASES, aliases);
setResult(RESULT_OK, intent);
finish();
}
}
} else if(id == R.id.cancel) {
setResult(RESULT_CANCELED);
finish();
} else if(id == R.id.ok) {
// Get list and return as result
Intent intent = new Intent();
intent.putExtra(Extra.ALIASES, aliases);
setResult(RESULT_OK, intent);
finish();
}

}
Expand Down
58 changes: 15 additions & 43 deletions app/src/main/java/org/yaaic/activity/AddChannelActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,51 +92,23 @@ public void onCreate(Bundle savedInstanceState)
@Override
public void onClick(View v)
{
// switch (v.getId()) {
// case R.id.add:
// String channel = channelInput.getText().toString().trim();
// channels.add(channel);
// adapter.add(channel);
// channelInput.setText("#");
// channelInput.setSelection(1);
// okButton.setEnabled(true);
// break;
//
// case R.id.cancel:
// setResult(RESULT_CANCELED);
// finish();
// break;
//
// case R.id.ok:
// // Get list and return as result
// Intent intent = new Intent();
// intent.putExtra(Extra.CHANNELS, channels);
// setResult(RESULT_OK, intent);
// finish();
// break;
// }

int id = v.getId();
if(id == R.id.add) {
String channel = channelInput.getText().toString().trim();
channels.add(channel);
adapter.add(channel);
channelInput.setText("#");
channelInput.setSelection(1);
okButton.setEnabled(true);
} else {
if(id == R.id.cancel) {
setResult(RESULT_CANCELED);
finish();
} else {
if(id == R.id.ok) {
// Get list and return as result
Intent intent = new Intent();
intent.putExtra(Extra.CHANNELS, channels);
setResult(RESULT_OK, intent);
finish();
}
}
String channel = channelInput.getText().toString().trim();
channels.add(channel);
adapter.add(channel);
channelInput.setText("#");
channelInput.setSelection(1);
okButton.setEnabled(true);
} else if(id == R.id.cancel) {
setResult(RESULT_CANCELED);
finish();
} else if(id == R.id.ok) {
// Get list and return as result
Intent intent = new Intent();
intent.putExtra(Extra.CHANNELS, channels);
setResult(RESULT_OK, intent);
finish();
}
}

Expand Down
42 changes: 17 additions & 25 deletions app/src/main/java/org/yaaic/activity/AddCommandsActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,34 +94,26 @@ public void onClick(View v)
{
int id = v.getId();
if(id == R.id.add) {
String command = commandInput.getText().toString().trim();
String command = commandInput.getText().toString().trim();

if (!command.startsWith("/")) {
command = "/" + command;
}

commands.add(command);
adapter.add(command);
commandInput.setText("/");
okButton.setEnabled(true);
} else {
if(id == R.id.cancel) {
setResult(RESULT_CANCELED);
finish();
} else {
if(id == R.id.ok) {
// Get list and return as result
Intent intent = new Intent();
intent.putExtra(Extra.COMMANDS, commands);
setResult(RESULT_OK, intent);
finish();
}
if (!command.startsWith("/")) {
command = "/" + command;
}
}




commands.add(command);
adapter.add(command);
commandInput.setText("/");
okButton.setEnabled(true);
} else if(id == R.id.cancel) {
setResult(RESULT_CANCELED);
finish();
} else if(id == R.id.ok) {
// Get list and return as result
Intent intent = new Intent();
intent.putExtra(Extra.COMMANDS, commands);
setResult(RESULT_OK, intent);
finish();
}
}

/**
Expand Down
44 changes: 14 additions & 30 deletions app/src/main/java/org/yaaic/activity/AddServerActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,36 +203,20 @@ public void onClick(View v)
Intent aliasIntent = new Intent(this, AddAliasActivity.class);
aliasIntent.putExtra(Extra.ALIASES, aliases);
startActivityForResult(aliasIntent, REQUEST_CODE_ALIASES);
} else {
if(id == R.id.authentication) {
Intent authIntent = new Intent(this, AuthenticationActivity.class);
authIntent.putExtra(Extra.NICKSERV_PASSWORD, authentication.getNickservPassword());
authIntent.putExtra(Extra.SASL_USER, authentication.getSaslUsername());
authIntent.putExtra(Extra.SASL_PASSWORD, authentication.getSaslPassword());
startActivityForResult(authIntent, REQUEST_CODE_AUTHENTICATION);
} else {

if(id == R.id.channels) {
Intent channelIntent = new Intent(this, AddChannelActivity.class);
channelIntent.putExtra(Extra.CHANNELS, channels);
startActivityForResult(channelIntent, REQUEST_CODE_CHANNELS);
} else {

if(id == R.id.commands) {
Intent commandsIntent = new Intent(this, AddCommandsActivity.class);
commandsIntent.putExtra(Extra.COMMANDS, commands);
startActivityForResult(commandsIntent, REQUEST_CODE_COMMANDS);
} else {



}

}

}


} else if(id == R.id.authentication) {
Intent authIntent = new Intent(this, AuthenticationActivity.class);
authIntent.putExtra(Extra.NICKSERV_PASSWORD, authentication.getNickservPassword());
authIntent.putExtra(Extra.SASL_USER, authentication.getSaslUsername());
authIntent.putExtra(Extra.SASL_PASSWORD, authentication.getSaslPassword());
startActivityForResult(authIntent, REQUEST_CODE_AUTHENTICATION);
} else if(id == R.id.channels) {
Intent channelIntent = new Intent(this, AddChannelActivity.class);
channelIntent.putExtra(Extra.CHANNELS, channels);
startActivityForResult(channelIntent, REQUEST_CODE_CHANNELS);
} else if(id == R.id.commands) {
Intent commandsIntent = new Intent(this, AddCommandsActivity.class);
commandsIntent.putExtra(Extra.COMMANDS, commands);
startActivityForResult(commandsIntent, REQUEST_CODE_COMMANDS);
}
}

Expand Down
34 changes: 11 additions & 23 deletions app/src/main/java/org/yaaic/activity/AuthenticationActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,21 +118,15 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
nickservPasswordEditText.setText("");
}

} else {
if(id == R.id.sasl_checkbox) {
saslUsernameLabel.setEnabled(isChecked);
saslUsernameEditText.setEnabled(isChecked);
saslPasswordLabel.setEnabled(isChecked);
saslPasswordEditText.setEnabled(isChecked);

if (!isChecked) {
saslUsernameEditText.setText("");
saslPasswordEditText.setText("");
}

} else {

} else if(id == R.id.sasl_checkbox) {
saslUsernameLabel.setEnabled(isChecked);
saslUsernameEditText.setEnabled(isChecked);
saslPasswordLabel.setEnabled(isChecked);
saslPasswordEditText.setEnabled(isChecked);

if (!isChecked) {
saslUsernameEditText.setText("");
saslPasswordEditText.setText("");
}

}
Expand All @@ -153,15 +147,9 @@ public void onClick(View v)
setResult(RESULT_OK, intent);
finish();

}else{
if(id == R.id.cancel) {
setResult(RESULT_CANCELED);
finish();

}else{

}

} else if(id == R.id.cancel) {
setResult(RESULT_CANCELED);
finish();
}
}
}
69 changes: 27 additions & 42 deletions app/src/main/java/org/yaaic/fragment/ConversationFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,51 +434,36 @@ public boolean onOptionsItemSelected(MenuItem item) {
server.setMayReconnect(false);
binder.getService().getConnection(serverId).quitServer();
server.clearConversations();
}else {

if(id == R.id.close) {
Conversation conversationToClose = pagerAdapter.getItem(pager.getCurrentItem());
// Make sure we part a channel when closing the channel conversation
if (conversationToClose.getType() == Conversation.TYPE_CHANNEL) {
binder.getService().getConnection(serverId).partChannel(conversationToClose.getName());
}
else if (conversationToClose.getType() == Conversation.TYPE_QUERY) {
server.removeConversation(conversationToClose.getName());
onRemoveConversation(conversationToClose.getName());
} else {
Toast.makeText(getActivity(), getResources().getString(R.string.close_server_window), Toast.LENGTH_SHORT).show();
}
}else {
if(id == R.id.join) {
startActivityForResult(new Intent(getActivity(), JoinActivity.class), REQUEST_CODE_JOIN);
} else {
if(id == R.id.users) {
Conversation conversationForUserList = pagerAdapter.getItem(pager.getCurrentItem());
if (conversationForUserList.getType() == Conversation.TYPE_CHANNEL) {
Intent intent = new Intent(getActivity(), UsersActivity.class);
intent.putExtra(
Extra.USERS,
binder.getService().getConnection(server.getId()).getUsersAsStringArray(
conversationForUserList.getName()
)
);
startActivityForResult(intent, REQUEST_CODE_USERS);
} else {
Toast.makeText(getActivity(), getResources().getString(R.string.only_usable_from_channel), Toast.LENGTH_SHORT).show();
}

} else {

}
}


} else if(id == R.id.close) {
Conversation conversationToClose = pagerAdapter.getItem(pager.getCurrentItem());
// Make sure we part a channel when closing the channel conversation
if (conversationToClose.getType() == Conversation.TYPE_CHANNEL) {
binder.getService().getConnection(serverId).partChannel(conversationToClose.getName());
}
else if (conversationToClose.getType() == Conversation.TYPE_QUERY) {
server.removeConversation(conversationToClose.getName());
onRemoveConversation(conversationToClose.getName());
} else {
Toast.makeText(getActivity(), getResources().getString(R.string.close_server_window), Toast.LENGTH_SHORT).show();
}
} else if(id == R.id.join) {
startActivityForResult(new Intent(getActivity(), JoinActivity.class), REQUEST_CODE_JOIN);
} else if(id == R.id.users) {
Conversation conversationForUserList = pagerAdapter.getItem(pager.getCurrentItem());
if (conversationForUserList.getType() == Conversation.TYPE_CHANNEL) {
Intent intent = new Intent(getActivity(), UsersActivity.class);
intent.putExtra(
Extra.USERS,
binder.getService().getConnection(server.getId()).getUsersAsStringArray(
conversationForUserList.getName()
)
);
startActivityForResult(intent, REQUEST_CODE_USERS);
} else {
Toast.makeText(getActivity(), getResources().getString(R.string.only_usable_from_channel), Toast.LENGTH_SHORT).show();
}


}


return true;
}

Expand Down
20 changes: 6 additions & 14 deletions app/src/main/java/org/yaaic/menu/ServerPopupMenu.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,12 @@ public boolean onMenuItemClick(MenuItem item) {

if(id == R.id.edit) {
listener.onEditServer(server);
}else{
if(id == R.id.delete) {
listener.onDeleteServer(server);
}else{
if(id == R.id.connect) {
listener.onConnectToServer(server);
}else{
if(id == R.id.disconnect) {
listener.onDisconnectFromServer(server);
}else{

}
}
}
} else if(id == R.id.delete) {
listener.onDeleteServer(server);
} else if(id == R.id.connect) {
listener.onConnectToServer(server);
} else if(id == R.id.disconnect) {
listener.onDisconnectFromServer(server);
}

return true;
Expand Down

0 comments on commit ca8a21e

Please sign in to comment.