Projects >> Speedometer >>d9dd7215e2036f6a09d38c966d3e1dd8e38680c6

Chunk
Conflicting content 
    Preference intervalPref = findPreference(getString(R.string.checkinIntervalPrefKey));
    Preference batteryPref = findPreference(getString(R.string.batteryMinThresPrefKey));
    
<<<<<<< HEAD
=======
    /* This should never occur. */
    if (checkinEnabled == null || intervalPref == null || batteryPref == null) {
      Log.w(SpeedometerApp.TAG, "Cannot find some of the preferences");
      Toast.makeText(SpeedometerPreferenceActivity.this, 
        getString(R.string.menuInitializationExceptionToast), Toast.LENGTH_LONG).show();
      return;
    }
    
>>>>>>> da4397a2c0b60c90be7833ce907368813258697d
    OnPreferenceChangeListener prefChangeListener = new OnPreferenceChangeListener() {
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
Solution content 
    Preference intervalPref = findPreference(getString(R.string.checkinIntervalPrefKey));
    Preference batteryPref = findPreference(getString(R.string.batteryMinThresPrefKey));
    
    /* This should never occur. */
    if (checkinEnabled == null || intervalPref == null || batteryPref == null) {
      Log.w(SpeedometerApp.TAG, "Cannot find some of the preferences");
      Toast.makeText(SpeedometerPreferenceActivity.this, 
        getString(R.string.menuInitializationExceptionToast), Toast.LENGTH_LONG).show();
      return;
    }
    
    OnPreferenceChangeListener prefChangeListener = new OnPreferenceChangeListener() {
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
File
SpeedometerPreferenceActivity.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Chunk
Conflicting content 
<<<<<<< HEAD
          try {
            Boolean val = (Boolean) newValue;
            Preference intervalPref = findPreference(getString(R.string.checkinIntervalPrefKey));
            if (!val.booleanValue()) {
              intervalPref.setEnabled(false);
            } else {
              intervalPref.setEnabled(true);
            }
          } catch (ClassCastException e) {
            Log.e(SpeedometerApp.TAG, "Cannot cast checkin box preference value to Boolean");
          }
          return true;  
        } else if (prefKey.compareTo(getString(R.string.checkinIntervalPrefKey)) == 0) {
          try {
            Integer val = Integer.parseInt((String) newValue);
            if (val <= 0 || val > 24) {
              Toast.makeText(SpeedometerPreferenceActivity.this, 
                  getString(R.string.invalidCheckinIntervalToast), Toast.LENGTH_LONG).show();
              return false;
            }
            return true;
          } catch (ClassCastException e) {
            Log.e(SpeedometerApp.TAG, "Cannot cast checkin interval preference value to Integer");
            return false;
          } catch (NumberFormatException e) {
            Log.e(SpeedometerApp.TAG, "Cannot cast checkin interval preference value to Integer");
            return false;
          }
        } else if (prefKey.compareTo(getString(R.string.batteryMinThresPrefKey)) == 0) {
          try {
            Integer val = Integer.parseInt((String) newValue);
            if (val < 0 || val > 100) {
              Toast.makeText(SpeedometerPreferenceActivity.this, 
                  getString(R.string.invalidBatteryToast), Toast.LENGTH_LONG).show();
              return false;
            }
            return true;
          } catch (ClassCastException e) {
            Log.e(SpeedometerApp.TAG, "Cannot cast battery preference value to Integer");
            return false;
          } catch (NumberFormatException e) {
            Log.e(SpeedometerApp.TAG, "Cannot cast battery preference value to Integer");
            return false;
          }  
=======
            intervalPref.setEnabled(val);
          } catch (ClassCastException e) {
            Log.e(SpeedometerApp.TAG, "Cannot cast checkin box preference value to Boolean");
          }
          return true;
        } else if (prefKey.compareTo(getString(R.string.checkinIntervalPrefKey)) == 0) {
          try {
            Integer val = Integer.parseInt((String) newValue);
            if (val <= 0 || val > 24) {
              Toast.makeText(SpeedometerPreferenceActivity.this,
                  getString(R.string.invalidCheckinIntervalToast), Toast.LENGTH_LONG).show();
              return false;
            }
            return true;
          } catch (ClassCastException e) {
            Log.e(SpeedometerApp.TAG, "Cannot cast checkin interval preference value to Integer");
            return false;
          } catch (NumberFormatException e) {
            Log.e(SpeedometerApp.TAG, "Cannot cast checkin interval preference value to Integer");
            return false;
          }
        } else if (prefKey.compareTo(getString(R.string.batteryMinThresPrefKey)) == 0) {
          try {
            Integer val = Integer.parseInt((String) newValue);
            if (val < 0 || val > 100) {
              Toast.makeText(SpeedometerPreferenceActivity.this,
                  getString(R.string.invalidBatteryToast), Toast.LENGTH_LONG).show();
              return false;
            }
            return true;
          } catch (ClassCastException e) {
            Log.e(SpeedometerApp.TAG, "Cannot cast battery preference value to Integer");
            return false;
          } catch (NumberFormatException e) {
            Log.e(SpeedometerApp.TAG, "Cannot cast battery preference value to Integer");
            return false;
          }
>>>>>>> da4397a2c0b60c90be7833ce907368813258697d
        }
        return true;
      }
Solution content 
          try {
            Boolean val = (Boolean) newValue;
            Preference intervalPref = findPreference(getString(R.string.checkinIntervalPrefKey));
            intervalPref.setEnabled(val);
          } catch (ClassCastException e) {
            Log.e(SpeedometerApp.TAG, "Cannot cast checkin box preference value to Boolean");
          }
          return true;
        } else if (prefKey.compareTo(getString(R.string.checkinIntervalPrefKey)) == 0) {
          try {
            Integer val = Integer.parseInt((String) newValue);
            if (val <= 0 || val > 24) {
              Toast.makeText(SpeedometerPreferenceActivity.this,
                  getString(R.string.invalidCheckinIntervalToast), Toast.LENGTH_LONG).show();
              return false;
            }
            return true;
          } catch (ClassCastException e) {
            Log.e(SpeedometerApp.TAG, "Cannot cast checkin interval preference value to Integer");
            return false;
          } catch (NumberFormatException e) {
            Log.e(SpeedometerApp.TAG, "Cannot cast checkin interval preference value to Integer");
            return false;
          }
        } else if (prefKey.compareTo(getString(R.string.batteryMinThresPrefKey)) == 0) {
          try {
            Integer val = Integer.parseInt((String) newValue);
            if (val < 0 || val > 100) {
              Toast.makeText(SpeedometerPreferenceActivity.this,
                  getString(R.string.invalidBatteryToast), Toast.LENGTH_LONG).show();
              return false;
            }
            return true;
          } catch (ClassCastException e) {
            Log.e(SpeedometerApp.TAG, "Cannot cast battery preference value to Integer");
            return false;
          } catch (NumberFormatException e) {
            Log.e(SpeedometerApp.TAG, "Cannot cast battery preference value to Integer");
            return false;
          }
        }
        return true;
      }
File
SpeedometerPreferenceActivity.java
Developer's decision
Version 2
Kind of conflict
Catch clause
If statement
Method invocation
Return statement
Try statement
Chunk
Conflicting content 
      
      }
    };
    
<<<<<<< HEAD
    if (checkinEnabled != null && intervalPref != null) {
      if (prefs.getBoolean(
          getString(R.string.checkinEnabledPrefKey), Config.DEFAULT_CHECKIN_ENABLED)) {
        Log.i(SpeedometerApp.TAG, "Checkin is enabled in the preference");
        intervalPref.setEnabled(true);
      } else {
        intervalPref.setEnabled(false);
      }
      checkinEnabled.setOnPreferenceChangeListener(prefChangeListener);
      intervalPref.setOnPreferenceChangeListener(prefChangeListener);
    }
    
    if (batteryPref != null) {
      batteryPref.setOnPreferenceChangeListener(prefChangeListener);
    }
=======
    if (prefs.getBoolean(getString(R.string.checkinEnabledPrefKey),
        Config.DEFAULT_CHECKIN_ENABLED)) {
      Log.i(SpeedometerApp.TAG, "Checkin is enabled in the preference");
      intervalPref.setEnabled(true);
    } else {
      intervalPref.setEnabled(false);
    }

    checkinEnabled.setOnPreferenceChangeListener(prefChangeListener);
    intervalPref.setOnPreferenceChangeListener(prefChangeListener);
    batteryPref.setOnPreferenceChangeListener(prefChangeListener);
>>>>>>> da4397a2c0b60c90be7833ce907368813258697d
  }
  
  /**
Solution content 
      }
    };
    
    if (prefs.getBoolean(getString(R.string.checkinEnabledPrefKey),
        Config.DEFAULT_CHECKIN_ENABLED)) {
      Log.i(SpeedometerApp.TAG, "Checkin is enabled in the preference");
      intervalPref.setEnabled(true);
    } else {
      intervalPref.setEnabled(false);
    }

    checkinEnabled.setOnPreferenceChangeListener(prefChangeListener);
    intervalPref.setOnPreferenceChangeListener(prefChangeListener);
    batteryPref.setOnPreferenceChangeListener(prefChangeListener);
  }
  
  /**
File
SpeedometerPreferenceActivity.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
      result.addResult("filtered_mean_rtt_ms", filteredAvg);
    }
    result.addResult("packet_loss", 1 - 
<<<<<<< HEAD
        ((double) rrtVals.size() / (double) Config.DEFAULT_PING_COUNT_PER_MEASUREMENT));
=======
        ((double) rrtVals.size() / (double) Config.PING_COUNT_PER_MEASUREMENT));
>>>>>>> da4397a2c0b60c90be7833ce907368813258697d
    
    return result;
  }
Solution content 
      result.addResult("filtered_mean_rtt_ms", filteredAvg);
    }
    result.addResult("packet_loss", 1 - 
        ((double) rrtVals.size() / (double) Config.PING_COUNT_PER_MEASUREMENT));
    
    return result;
  }
File
PingTask.java
Developer's decision
Version 2
Kind of conflict
Cast expression
Chunk
Conflicting content 
            }
          }
        }
<<<<<<< HEAD
        this.progress = 100 * ++lineCnt / Config.DEFAULT_PING_COUNT_PER_MEASUREMENT;
=======
        this.progress = 100 * ++lineCnt / Config.PING_COUNT_PER_MEASUREMENT;
>>>>>>> da4397a2c0b60c90be7833ce907368813258697d
        Log.i(SpeedometerApp.TAG, line);
      }     
      measurementResult = constructResult(rrts);
Solution content 
            }
          }
        }
        this.progress = 100 * ++lineCnt / Config.PING_COUNT_PER_MEASUREMENT;
        Log.i(SpeedometerApp.TAG, line);
      }     
      measurementResult = constructResult(rrts);
File
PingTask.java
Developer's decision
Version 2
Kind of conflict
Variable
Chunk
Conflicting content 
    try {       
      int timeOut = (int) (1000 * (double) pingTask.pingTimeoutSec /
<<<<<<< HEAD
            Config.DEFAULT_PING_COUNT_PER_MEASUREMENT);
=======
            Config.PING_COUNT_PER_MEASUREMENT);
>>>>>>> da4397a2c0b60c90be7833ce907368813258697d
      int successfulPingCnt = 0;
      long totalPingDelay = 0;
      for (int i = 0; i < Config.PING_COUNT_PER_MEASUREMENT; i++) {
Solution content 
    try {       
      int timeOut = (int) (1000 * (double) pingTask.pingTimeoutSec /
            Config.PING_COUNT_PER_MEASUREMENT);
      int successfulPingCnt = 0;
      long totalPingDelay = 0;
      for (int i = 0; i < Config.PING_COUNT_PER_MEASUREMENT; i++) {
File
PingTask.java
Developer's decision
Version 2
Kind of conflict
Other
Chunk
Conflicting content 
=======
          totalPingDelay += rrtVal;
          rrts.add((double) rrtVal);
        }
<<<<<<< HEAD
        this.progress = 100 * i / Config.DEFAULT_PING_COUNT_PER_MEASUREMENT;
        this.progress = 100 * i / Config.PING_COUNT_PER_MEASUREMENT;
>>>>>>> da4397a2c0b60c90be7833ce907368813258697d
      }
      Log.i(SpeedometerApp.TAG, "java ping succeeds");
      return constructResult(rrts);
Solution content 
          totalPingDelay += rrtVal;
          rrts.add((double) rrtVal);
        }
        this.progress = 100 * i / Config.PING_COUNT_PER_MEASUREMENT;
      }
      Log.i(SpeedometerApp.TAG, "java ping succeeds");
      return constructResult(rrts);
File
PingTask.java
Developer's decision
Version 2
Kind of conflict
Variable
Chunk
Conflicting content 
          CoreConnectionPNames.CONNECTION_TIMEOUT, 1000));
      
      int timeOut = (int) (1000 * (double) pingTask.pingTimeoutSec /
<<<<<<< HEAD
          Config.DEFAULT_PING_COUNT_PER_MEASUREMENT);
=======
          Config.PING_COUNT_PER_MEASUREMENT);
>>>>>>> da4397a2c0b60c90be7833ce907368813258697d
      HttpConnectionParams.setConnectionTimeout(headMethod.getParams(), timeOut);
                      
      for (int i = 0; i < Config.PING_COUNT_PER_MEASUREMENT; i++) {
Solution content 
          CoreConnectionPNames.CONNECTION_TIMEOUT, 1000));
      
      int timeOut = (int) (1000 * (double) pingTask.pingTimeoutSec /
          Config.PING_COUNT_PER_MEASUREMENT);
      HttpConnectionParams.setConnectionTimeout(headMethod.getParams(), timeOut);
                      
      for (int i = 0; i < Config.PING_COUNT_PER_MEASUREMENT; i++) {
File
PingTask.java
Developer's decision
Version 2
Kind of conflict
Other
Chunk
Conflicting content 
        HttpResponse response = client.execute(headMethod);  
        pingEndTime = System.currentTimeMillis();
        rrts.add((double) (pingEndTime - pingStartTime));
<<<<<<< HEAD
        this.progress = 100 * i / Config.DEFAULT_PING_COUNT_PER_MEASUREMENT;
=======
        this.progress = 100 * i / Config.PING_COUNT_PER_MEASUREMENT;
>>>>>>> da4397a2c0b60c90be7833ce907368813258697d
      }
      Log.i(SpeedometerApp.TAG, "HTTP get ping succeeds");
      return constructResult(rrts);
Solution content 
        HttpResponse response = client.execute(headMethod);  
        pingEndTime = System.currentTimeMillis();
        rrts.add((double) (pingEndTime - pingStartTime));
        this.progress = 100 * i / Config.PING_COUNT_PER_MEASUREMENT;
      }
      Log.i(SpeedometerApp.TAG, "HTTP get ping succeeds");
      return constructResult(rrts);
File
PingTask.java
Developer's decision
Version 2
Kind of conflict
Variable