Projects >> MyExpenses >>2fbdd415799eb7ab47b090b31e4e5dc6c2c2ddd8

Chunk
Conflicting content 
      mPictureView.setVisibility(View.GONE);
      break;
    case R.id.VIEW_COMMAND:
<<<<<<< HEAD
a      startActivity(Transaction.getViewIntent(mPictureUri));
=======
      startActivity(Transaction.getViewIntent(mPictureUri));
>>>>>>> 5b5fca05e4f2c38d17bafd163d706b2de0b69134
      break;
    case R.id.CHANGE_COMMAND:
      startMediaChooserDo();
Solution content 
      mPictureView.setVisibility(View.GONE);
      break;
    case R.id.VIEW_COMMAND:
      startActivity(Transaction.getViewIntent(mPictureUri));
      break;
    case R.id.CHANGE_COMMAND:
      startMediaChooserDo();
File
ExpenseEdit.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
  }
  
  public static void delete(long id) {
<<<<<<< HEAD
    Cursor c = cr().query(
        CONTENT_URI.buildUpon().appendPath(String.valueOf(id)).build(),
        new String[]{KEY_PICTURE_URI},
        null, null, null);
    if (c!=null) {
      if (c.moveToFirst()) {
        if (!c.isNull(0)) {
            disposeStaleFile(Uri.parse(c.getString(0)));
        }
      }
      c.close();
    }
=======
>>>>>>> 5b5fca05e4f2c38d17bafd163d706b2de0b69134
    cr().delete(ContentUris.appendId(CONTENT_URI.buildUpon(),id).build(),null,null);
  }
  //needed for Template subclass
Solution content 
  }
  
  public static void delete(long id) {
    cr().delete(ContentUris.appendId(CONTENT_URI.buildUpon(),id).build(),null,null);
  }
  //needed for Template subclass
File
Transaction.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
    initialValues.put(KEY_CR_STATUS,crStatus.name());
    initialValues.put(KEY_ACCOUNTID, accountId);

<<<<<<< HEAD
    if (pictureUriStale!=null  && !pictureUriStale.equals(pictureUri)) {
      disposeStaleFile(pictureUriStale);
    }

    if (pictureUri!=null) {
      if (pictureUri.toString().startsWith(Utils.getPictureUriBase())) {
=======
    if (pictureUri!=null) {
      if (pictureUri.toString().startsWith(Utils.getPictureUriBase(false))) {
>>>>>>> 5b5fca05e4f2c38d17bafd163d706b2de0b69134
        Log.d("DEBUG","got Uri in our home space, nothing todo");
      } else {
        boolean isInTempFolder = pictureUri.toString().startsWith(Utils.getPictureUriBase(true));
Solution content 
    initialValues.put(KEY_CR_STATUS,crStatus.name());
    initialValues.put(KEY_ACCOUNTID, accountId);

    if (pictureUri!=null) {
      if (pictureUri.toString().startsWith(Utils.getPictureUriBase(false))) {
        Log.d("DEBUG","got Uri in our home space, nothing todo");
      } else {
        boolean isInTempFolder = pictureUri.toString().startsWith(Utils.getPictureUriBase(true));
File
Transaction.java
Developer's decision
Version 2
Kind of conflict
If statement
Chunk
Conflicting content 
  public void setPictureUri(Uri pictureUriIn) {
    this.pictureUri = pictureUriIn;
  }
<<<<<<< HEAD
  private static void disposeStaleFile(Uri fileUri) {
      if (fileUri.getScheme().equals("file")) {
          File backupDir = new File(MyApplication.getInstance().getExternalFilesDir(
                  null), Environment.DIRECTORY_PICTURES + ".bak");
          backupDir.mkdir();
          File staleFile = new File(fileUri.getPath());
          staleFile.renameTo(new File(backupDir, staleFile.getName()));
      } else {
          MyApplication.getInstance().getContentResolver()
                  .delete(fileUri,null,null);
      }
  }
=======

>>>>>>> 5b5fca05e4f2c38d17bafd163d706b2de0b69134
  public static Intent getViewIntent(Uri pictureUri) {
      Intent intent = new Intent(Intent.ACTION_VIEW, pictureUri);
      intent.putExtra(Intent.EXTRA_STREAM, pictureUri);
Solution content 
  public void setPictureUri(Uri pictureUriIn) {
    this.pictureUri = pictureUriIn;
  }

  public static Intent getViewIntent(Uri pictureUri) {
      Intent intent = new Intent(Intent.ACTION_VIEW, pictureUri);
      intent.putExtra(Intent.EXTRA_STREAM, pictureUri);
File
Transaction.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Chunk
Conflicting content 
  public static final String KEY_EXCLUDE_FROM_TOTALS = "exclude_from_totals";
  public static final String KEY_PREDEFINED_METHOD_NAME = "predefined";
  public static final String KEY_UUID = "uuid";
<<<<<<< HEAD
  public static final String KEY_PICTURE_URI = "picture_uri";
=======
  public static final String KEY_PICTURE_URI = "picture_id";//historical reasons
>>>>>>> 5b5fca05e4f2c38d17bafd163d706b2de0b69134
  /**
   * column alias for the second group (month or week)
   */
Solution content 
  public static final String KEY_EXCLUDE_FROM_TOTALS = "exclude_from_totals";
  public static final String KEY_PREDEFINED_METHOD_NAME = "predefined";
  public static final String KEY_UUID = "uuid";
  public static final String KEY_PICTURE_URI = "picture_id";//historical reasons
  /**
   * column alias for the second group (month or week)
   */
File
DatabaseConstants.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
<<<<<<< HEAD
=======
import android.provider.Settings;
>>>>>>> 5b5fca05e4f2c38d17bafd163d706b2de0b69134
import android.support.v4.content.FileProvider;
import android.text.Html;
import android.text.InputFilter;
Solution content 
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
import android.provider.Settings;
import android.support.v4.content.FileProvider;
import android.text.Html;
import android.text.InputFilter;
File
Utils.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import android.widget.EditText;
import android.widget.Toast;

<<<<<<< HEAD
import org.acra.ErrorReporter;
=======
//import org.acra.ErrorReporter;
>>>>>>> 5b5fca05e4f2c38d17bafd163d706b2de0b69134
import org.totschnig.myexpenses.MyApplication;
import org.totschnig.myexpenses.R;
import org.totschnig.myexpenses.model.Account;
Solution content 
import android.widget.EditText;
import android.widget.Toast;

import org.acra.ErrorReporter;

import org.totschnig.myexpenses.MyApplication;
import org.totschnig.myexpenses.R;
import org.totschnig.myexpenses.model.Account;
File
Utils.java
Developer's decision
Version 1
Kind of conflict
Comment
Import
Chunk
Conflicting content 
    // using Environment.getExternalStorageState() before doing this.

    File mediaStorageDir = temp ? getCacheDir() : getPictureDir();
<<<<<<< HEAD

    return new File(mediaStorageDir, getOutputMediaFileName());
  }
  public static Uri getOutputMediaUri(boolean temp) {
      boolean secure = true;
      if (secure && !temp) {
           return FileProvider.getUriForFile(MyApplication.getInstance(),
                   "org.totschnig.myexpenses.fileprovider",
                   getOutputMediaFile(false));
      } else {
          return Uri.fromFile(getOutputMediaFile(temp));
      }
  }
    public static String getPictureUriBase() {
       String sampleUri = getOutputMediaUri(false).toString();
       return sampleUri.substring(0,sampleUri.lastIndexOf('/'));
    }

  private static String getOutputMediaFileName() {
      String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US)
              .format(new Date());
      return timeStamp + ".jpg";
  }

  public static File getPictureDir() {
      File result = MyApplication.getInstance().isProtected() ?
            new File (MyApplication.getInstance().getFilesDir(),
                "images") :
            MyApplication.getInstance().getExternalFilesDir(
                Environment.DIRECTORY_PICTURES);
      result.mkdir();
      return result;
=======
    int postfix = 0;
    File result;
    do {
      result = new File(mediaStorageDir, getOutputMediaFileName(
          fileName,
          postfix));
      postfix++;
    } while (result.exists());
    return result;
  }
  public static Uri getOutputMediaUri(boolean temp) {
    String fileName = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US)
        .format(new Date());
      if (MyApplication.getInstance().isProtected() && !temp) {
           return FileProvider.getUriForFile(MyApplication.getInstance(),
                   "org.totschnig.myexpenses.fileprovider",
                   getOutputMediaFile(fileName,false));
      } else {
          return Uri.fromFile(getOutputMediaFile(fileName,temp));
      }
>>>>>>> 5b5fca05e4f2c38d17bafd163d706b2de0b69134
  }
    public static String getPictureUriBase(boolean temp) {
       String sampleUri = getOutputMediaUri(temp).toString();
Solution content 
    // using Environment.getExternalStorageState() before doing this.

    File mediaStorageDir = temp ? getCacheDir() : getPictureDir();
    int postfix = 0;
    File result;
    do {
      result = new File(mediaStorageDir, getOutputMediaFileName(
          fileName,
          postfix));
      postfix++;
    } while (result.exists());
    return result;
  }
  public static Uri getOutputMediaUri(boolean temp) {
    String fileName = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US)
        .format(new Date());
      if (MyApplication.getInstance().isProtected() && !temp) {
           return FileProvider.getUriForFile(MyApplication.getInstance(),
                   "org.totschnig.myexpenses.fileprovider",
                   getOutputMediaFile(fileName,false));
      } else {
          return Uri.fromFile(getOutputMediaFile(fileName,temp));
      }
  }
    public static String getPictureUriBase(boolean temp) {
       String sampleUri = getOutputMediaUri(temp).toString();
File
Utils.java
Developer's decision
Version 2
Kind of conflict
Do statement
If statement
Method declaration
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
       return sampleUri.substring(0,sampleUri.lastIndexOf('/'));
    }

<<<<<<< HEAD
    /**
     * The file is only moved to
     * @param staleFile
     */
  public static void moveToBackup(File staleFile) {
      if (MyApplication.getInstance().isProtected()) {
          if (staleFile.isDirectory()) {
              for (File f : staleFile.listFiles()) {
                  f.delete();
              }
          }
          staleFile.delete();
      } else {
          File backupDir = new File(MyApplication.getInstance().getExternalFilesDir(
                  null), Environment.DIRECTORY_PICTURES + ".bak");
          backupDir.mkdir();
          if (staleFile.isDirectory()) {
              for (File f : staleFile.listFiles()) {
                  f.renameTo(new File(backupDir, f.getName()));
              }
          }
          staleFile.renameTo(new File(backupDir, staleFile.getName()));
      }
=======
  private static String getOutputMediaFileName(String base,int postfix) {
      if (postfix>0) {
        base+= "_"+postfix;
      }
      return base + ".jpg";
  }
    public static File getPictureDir() {
        return getPictureDir(MyApplication.getInstance().isProtected());
    }
  public static File getPictureDir(boolean secure) {
      File result =  secure ?
            new File (MyApplication.getInstance().getFilesDir(),
                "images") :
            MyApplication.getInstance().getExternalFilesDir(
                Environment.DIRECTORY_PICTURES);
      result.mkdir();
      return result;
>>>>>>> 5b5fca05e4f2c38d17bafd163d706b2de0b69134
  }

  /**
Solution content 
    }
       return sampleUri.substring(0,sampleUri.lastIndexOf('/'));

  private static String getOutputMediaFileName(String base,int postfix) {
      if (postfix>0) {
        base+= "_"+postfix;
      }
      return base + ".jpg";
  }
    public static File getPictureDir() {
        return getPictureDir(MyApplication.getInstance().isProtected());
    }
  public static File getPictureDir(boolean secure) {
      File result =  secure ?
            new File (MyApplication.getInstance().getFilesDir(),
                "images") :
            MyApplication.getInstance().getExternalFilesDir(
                Environment.DIRECTORY_PICTURES);
      result.mkdir();
      return result;
  }

  /**
File
Utils.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Method declaration
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
  public static void copy(Uri src, Uri dest) throws IOException {
    InputStream input = null;
    OutputStream output = null;
<<<<<<< HEAD
    Uri outputUri = getOutputMediaUri(false);

    if (uri.getScheme().equals("file") && outputUri.getScheme().equals("file")) {
      if (new File(uri.getPath()).renameTo(new File(outputUri.getPath()))) {
        return outputUri;
      }
    }

    try {
      input = MyApplication.getInstance().getContentResolver()
          .openInputStream(uri);
      output = MyApplication.getInstance().getContentResolver()
              .openOutputStream(outputUri);
=======

    try {
      input = MyApplication.getInstance().getContentResolver()
          .openInputStream(src);
      output = MyApplication.getInstance().getContentResolver()
              .openOutputStream(dest);
>>>>>>> 5b5fca05e4f2c38d17bafd163d706b2de0b69134
      final byte[] buffer = new byte[1024];
      int read;
Solution content 
  public static void copy(Uri src, Uri dest) throws IOException {
    InputStream input = null;
    OutputStream output = null;

    try {
      input = MyApplication.getInstance().getContentResolver()
          .openInputStream(src);
      output = MyApplication.getInstance().getContentResolver()
              .openOutputStream(dest);
      final byte[] buffer = new byte[1024];
      int read;
File
Utils.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Try statement
Variable
Chunk
Conflicting content 
    } finally {

      output.flush();

<<<<<<< HEAD
      return outputUri;
    } catch (FileNotFoundException e) {
      // TODO Auto-generated catch block
      e.printStackTrace();
    } catch (IOException e) {
      // TODO Auto-generated catch block
      e.printStackTrace();
=======
>>>>>>> 5b5fca05e4f2c38d17bafd163d706b2de0b69134
      try {
        input.close();
Solution content 
      output.flush();

    } finally {
      try {
        input.close();
File
Utils.java
Developer's decision
Version 2
Kind of conflict
Catch clause
Comment
Method invocation
Return statement
Variable
Chunk
Conflicting content 
<<<<<<< HEAD
    return greyLevel > 127 ? Color.BLACK : Color.WHITE;
  }
//  public static boolean verifyLicenceKey(String key) {
//    String s = Secure.getString(MyApplication.getInstance()
//        .getContentResolver(), Secure.ANDROID_ID)
//        + MyApplication.CONTRIB_SECRET;
//    Long l = (s.hashCode() & 0x00000000ffffffffL);
//    return l.toString().equals(key);
//  }
=======
  public static boolean verifyLicenceKey(String key) {
    String s = Settings.Secure.getString(MyApplication.getInstance()
            .getContentResolver(), Settings.Secure.ANDROID_ID)
        + MyApplication.CONTRIB_SECRET;
    Long l = (s.hashCode() & 0x00000000ffffffffL);
    return l.toString().equals(key);
  }
>>>>>>> 5b5fca05e4f2c38d17bafd163d706b2de0b69134

  /**
   * @param ctx
Solution content 
    return greyLevel > 127 ? Color.BLACK : Color.WHITE;
  }

  public static boolean verifyLicenceKey(String key) {
    String s = Settings.Secure.getString(MyApplication.getInstance()
            .getContentResolver(), Settings.Secure.ANDROID_ID)
        + MyApplication.CONTRIB_SECRET;
    Long l = (s.hashCode() & 0x00000000ffffffffL);
    return l.toString().equals(key);
  }

  /**
   * @param ctx
File
Utils.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration