| Chunk |
|---|
| Conflicting content |
|---|
SharedPreferences.Editor editor = prefs.edit();
boolean doCommit = false;
if (!prefs.contains(PreferenceConstants.SHIFT_FKEYS) &&
<<<<<<< HEAD:app/src/main/java/org/connectbot/HostListActivity.java
!prefs.contains(PreferenceConstants.CTRL_FKEYS)) {
SharedPreferences.Editor editor = prefs.edit();
=======
!prefs.contains(PreferenceConstants.CTRL_FKEYS)) {
>>>>>>> f129a9b52110ffafec4400e17d78881c50307d8a:src/org/connectbot/HostListActivity.java
editor.putBoolean(PreferenceConstants.SHIFT_FKEYS, true);
editor.putBoolean(PreferenceConstants.CTRL_FKEYS, true);
doCommit = true; |
| Solution content |
|---|
SharedPreferences.Editor editor = prefs.edit();
boolean doCommit = false;
if (!prefs.contains(PreferenceConstants.SHIFT_FKEYS) &&
!prefs.contains(PreferenceConstants.CTRL_FKEYS)) {
editor.putBoolean(PreferenceConstants.SHIFT_FKEYS, true);
editor.putBoolean(PreferenceConstants.CTRL_FKEYS, true);
doCommit = true; |
| File |
|---|
| HostListActivity.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
// with our derived modifier state applied.
int uchar = event.getUnicodeChar(derivedMetaState & ~HC_META_CTRL_MASK);
int ucharWithoutAlt = event.getUnicodeChar(
<<<<<<< HEAD:app/src/main/java/org/connectbot/service/TerminalKeyListener.java
derivedMetaState & ~(HC_META_ALT_MASK | HC_META_CTRL_MASK));
if (uchar != ucharWithoutAlt) {
=======
derivedMetaState & ~(HC_META_ALT_MASK | HC_META_CTRL_MASK));
if (uchar == 0) {
// Keymap doesn't know the key with alt on it, so just go with the unmodified version
uchar = ucharWithoutAlt;
}
else if (uchar != ucharWithoutAlt) {
>>>>>>> f129a9b52110ffafec4400e17d78881c50307d8a:src/org/connectbot/service/TerminalKeyListener.java
// The alt key was used to modify the character returned; therefore, drop the alt
// modifier from the state so we don't end up sending alt+key.
derivedMetaState &= ~HC_META_ALT_MASK; |
| Solution content |
|---|
// with our derived modifier state applied.
int uchar = event.getUnicodeChar(derivedMetaState & ~HC_META_CTRL_MASK);
int ucharWithoutAlt = event.getUnicodeChar(
derivedMetaState & ~(HC_META_ALT_MASK | HC_META_CTRL_MASK));
if (uchar == 0) {
// Keymap doesn't know the key with alt on it, so just go with the unmodified version
uchar = ucharWithoutAlt;
} else if (uchar != ucharWithoutAlt) {
// The alt key was used to modify the character returned; therefore, drop the alt
// modifier from the state so we don't end up sending alt+key.
derivedMetaState &= ~HC_META_ALT_MASK; |
| File |
|---|
| TerminalKeyListener.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| If statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
String key) {
if (PreferenceConstants.KEYMODE.equals(key) ||
<<<<<<< HEAD:app/src/main/java/org/connectbot/service/TerminalKeyListener.java
PreferenceConstants.SHIFT_FKEYS.equals(key) ||
PreferenceConstants.CTRL_FKEYS.equals(key) ||
PreferenceConstants.VOLUME_FONT.equals(key)) {
=======
PreferenceConstants.SHIFT_FKEYS.equals(key) ||
PreferenceConstants.CTRL_FKEYS.equals(key) ||
PreferenceConstants.VOLUME_FONT.equals(key) ||
PreferenceConstants.STICKY_MODIFIERS.equals(key)) {
>>>>>>> f129a9b52110ffafec4400e17d78881c50307d8a:src/org/connectbot/service/TerminalKeyListener.java
updatePrefs();
}
} |
| Solution content |
|---|
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
String key) {
if (PreferenceConstants.KEYMODE.equals(key) ||
PreferenceConstants.SHIFT_FKEYS.equals(key) ||
PreferenceConstants.CTRL_FKEYS.equals(key) ||
PreferenceConstants.VOLUME_FONT.equals(key) ||
PreferenceConstants.STICKY_MODIFIERS.equals(key)) {
updatePrefs();
}
} |
| File |
|---|
| TerminalKeyListener.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |