Code clean up
This commit is contained in:
parent
e98f7e57b0
commit
11e26e71f6
|
@ -1,7 +1,6 @@
|
|||
package eu.siacs.conversations.ui;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.res.Resources;
|
||||
import android.os.Bundle;
|
||||
import android.preference.PreferenceManager;
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
|
|||
import eu.siacs.conversations.xmpp.jid.Jid;
|
||||
|
||||
public class BlocklistActivity extends AbstractSearchableListItemActivity implements OnUpdateBlocklist {
|
||||
private List<String> mKnownHosts = new ArrayList<String>();
|
||||
private List<String> mKnownHosts = new ArrayList<>();
|
||||
|
||||
private Account account = null;
|
||||
|
||||
|
|
|
@ -11,8 +11,6 @@ import android.widget.Toast;
|
|||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.xmpp.jid.InvalidJidException;
|
||||
import eu.siacs.conversations.xmpp.jid.Jid;
|
||||
|
||||
public class ChangePasswordActivity extends XmppActivity implements XmppConnectionService.OnAccountPasswordChanged {
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ import eu.siacs.conversations.entities.ListItem;
|
|||
import eu.siacs.conversations.xmpp.jid.Jid;
|
||||
|
||||
public class ChooseContactActivity extends AbstractSearchableListItemActivity {
|
||||
private List<String> mActivatedAccounts = new ArrayList<String>();
|
||||
private List<String> mActivatedAccounts = new ArrayList<>();
|
||||
private List<String> mKnownHosts;
|
||||
|
||||
private Set<Contact> selected;
|
||||
|
@ -61,7 +61,7 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
|
|||
InputMethodManager.HIDE_IMPLICIT_ONLY);
|
||||
MenuInflater inflater = getMenuInflater();
|
||||
inflater.inflate(R.menu.select_multiple, menu);
|
||||
selected = new HashSet<Contact>();
|
||||
selected = new HashSet<>();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -305,7 +305,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
|
|||
case R.id.action_advanced_mode:
|
||||
this.mAdvancedMode = !menuItem.isChecked();
|
||||
menuItem.setChecked(this.mAdvancedMode);
|
||||
getPreferences().edit().putBoolean("advanced_muc_mode", mAdvancedMode).commit();
|
||||
getPreferences().edit().putBoolean("advanced_muc_mode", mAdvancedMode).apply();
|
||||
mConferenceInfoTable.setVisibility(this.mAdvancedMode ? View.VISIBLE : View.GONE);
|
||||
invalidateOptionsMenu();
|
||||
updateView();
|
||||
|
|
|
@ -433,17 +433,17 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
|
|||
}
|
||||
|
||||
public void setupIme() {
|
||||
if (activity == null) {
|
||||
return;
|
||||
} else if (activity.usingEnterKey() && activity.enterIsSend()) {
|
||||
mEditMessage.setInputType(mEditMessage.getInputType() & (~InputType.TYPE_TEXT_FLAG_MULTI_LINE));
|
||||
mEditMessage.setInputType(mEditMessage.getInputType() & (~InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE));
|
||||
} else if (activity.usingEnterKey()) {
|
||||
mEditMessage.setInputType(mEditMessage.getInputType() | InputType.TYPE_TEXT_FLAG_MULTI_LINE);
|
||||
mEditMessage.setInputType(mEditMessage.getInputType() & (~InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE));
|
||||
} else {
|
||||
mEditMessage.setInputType(mEditMessage.getInputType() | InputType.TYPE_TEXT_FLAG_MULTI_LINE);
|
||||
mEditMessage.setInputType(mEditMessage.getInputType() | InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE);
|
||||
if (activity != null) {
|
||||
if (activity.usingEnterKey() && activity.enterIsSend()) {
|
||||
mEditMessage.setInputType(mEditMessage.getInputType() & (~InputType.TYPE_TEXT_FLAG_MULTI_LINE));
|
||||
mEditMessage.setInputType(mEditMessage.getInputType() & (~InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE));
|
||||
} else if (activity.usingEnterKey()) {
|
||||
mEditMessage.setInputType(mEditMessage.getInputType() | InputType.TYPE_TEXT_FLAG_MULTI_LINE);
|
||||
mEditMessage.setInputType(mEditMessage.getInputType() & (~InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE));
|
||||
} else {
|
||||
mEditMessage.setInputType(mEditMessage.getInputType() | InputType.TYPE_TEXT_FLAG_MULTI_LINE);
|
||||
mEditMessage.setInputType(mEditMessage.getInputType() | InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue