Projects >> PinDroid >>b617485f492f24bbb6042d00e2e9e6cb999aecd6

Chunk
Conflicting content 
package com.pindroid.activity;

<<<<<<< HEAD
import com.pindroid.Constants.BookmarkViewType;
import com.pindroid.R;
import com.pindroid.action.BookmarkTaskArgs;
import com.pindroid.action.DeleteBookmarkTask;
import com.pindroid.action.IntentHelper;
import com.pindroid.action.MarkReadBookmarkTask;
import com.pindroid.fragment.AddBookmarkFragment;
import com.pindroid.fragment.AddBookmarkFragment.OnBookmarkSaveListener;
import com.pindroid.fragment.BrowseBookmarkFeedFragment;
import com.pindroid.fragment.BrowseBookmarksFragment;
import com.pindroid.fragment.BrowseBookmarksFragment.OnBookmarkSelectedListener;
import com.pindroid.fragment.BrowseTagsFragment;
import com.pindroid.fragment.BrowseTagsFragment.OnTagSelectedListener;
import com.pindroid.fragment.ViewBookmarkFragment;
import com.pindroid.fragment.ViewBookmarkFragment.OnBookmarkActionListener;
import com.pindroid.providers.BookmarkContent.Bookmark;

=======
>>>>>>> 84af87db6b2e2d835220d9010c3e45a7c0026d2a
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
Solution content 
package com.pindroid.activity;

import com.pindroid.Constants.BookmarkViewType;
import com.pindroid.R;
import com.pindroid.action.BookmarkTaskArgs;
import com.pindroid.action.DeleteBookmarkTask;
import com.pindroid.action.IntentHelper;
import com.pindroid.action.MarkReadBookmarkTask;
import com.pindroid.fragment.AddBookmarkFragment;
import com.pindroid.fragment.AddBookmarkFragment.OnBookmarkSaveListener;
import com.pindroid.fragment.BrowseBookmarkFeedFragment;
import com.pindroid.fragment.BrowseBookmarksFragment;
import com.pindroid.fragment.BrowseBookmarksFragment.OnBookmarkSelectedListener;
import com.pindroid.fragment.BrowseTagsFragment;
import com.pindroid.fragment.BrowseTagsFragment.OnTagSelectedListener;
import com.pindroid.fragment.ViewBookmarkFragment;
import com.pindroid.fragment.ViewBookmarkFragment.OnBookmarkActionListener;
import com.pindroid.providers.BookmarkContent.Bookmark;

import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
File
BrowseBookmarks.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;

<<<<<<< HEAD
public class BrowseBookmarks extends FragmentBaseActivity implements OnBookmarkSelectedListener, 
	OnBookmarkActionListener, OnBookmarkSaveListener, OnTagSelectedListener {

	private String tagname = "";
	private Boolean unread = false;
	private String path = "";
=======
import com.pindroid.R;
import com.pindroid.action.IntentHelper;
import com.pindroid.fragment.BrowseBookmarkFeedFragment;
import com.pindroid.fragment.BrowseBookmarksFragment;
import com.pindroid.platform.BookmarkManager;
import com.pindroid.providers.BookmarkContent.Bookmark;

public class BrowseBookmarks extends FragmentBaseActivity implements BrowseBookmarksFragment.OnBookmarkSelectedListener {
>>>>>>> 84af87db6b2e2d835220d9010c3e45a7c0026d2a
	
	@Override
	public void onCreate(Bundle savedInstanceState){
Solution content 
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;

public class BrowseBookmarks extends FragmentBaseActivity implements OnBookmarkSelectedListener, 
	OnBookmarkActionListener, OnBookmarkSaveListener, OnTagSelectedListener {

	private String tagname = "";
	private Boolean unread = false;
	private String path = "";
	
	@Override
	public void onCreate(Bundle savedInstanceState){
File
BrowseBookmarks.java
Developer's decision
Version 1
Kind of conflict
Attribute
Import
Chunk
Conflicting content 
			finish();
		} 	
			if(data.getUserInfo() != "") {
				username = data.getUserInfo();
			} else username = mAccount.name;
<<<<<<< HEAD

			tagname = data.getQueryParameter("tagname");
			unread = data.getQueryParameter("unread") != null;
			path = data.getPath();
			
	    	if(!data.getScheme().equals("content")) {
	    		startActivity(IntentHelper.OpenInBrowser(data.toString()));
	    		finish();
	    	}
		}		
=======
		}
		
		if(path.contains("bookmarks") && TextUtils.isDigitsOnly(data.getLastPathSegment())) {
			viewBookmark(Integer.parseInt(data.getLastPathSegment()));
>>>>>>> 84af87db6b2e2d835220d9010c3e45a7c0026d2a
		
		FragmentManager fm = getSupportFragmentManager();
		FragmentTransaction t = fm.beginTransaction();
Solution content 
			if(data.getUserInfo() != "") {
				username = data.getUserInfo();
			} else username = mAccount.name;

			tagname = data.getQueryParameter("tagname");
			unread = data.getQueryParameter("unread") != null;
			path = data.getPath();
			
	    	if(!data.getScheme().equals("content")) {
	    		startActivity(IntentHelper.OpenInBrowser(data.toString()));
	    		finish();
	    	}
		}		
		
		FragmentManager fm = getSupportFragmentManager();
		FragmentTransaction t = fm.beginTransaction();
File
BrowseBookmarks.java
Developer's decision
Version 1
Kind of conflict
Attribute
If statement
Method invocation
Chunk
Conflicting content 
	}

	public void onBookmarkMark(Bookmark b) {
<<<<<<< HEAD
    	if(b != null && isMyself() && b.getToRead()) {
    		BookmarkTaskArgs unreadArgs = new BookmarkTaskArgs(b, mAccount, this);
    		new MarkReadBookmarkTask().execute(unreadArgs);
=======
    	if(isMyself() && b.getToRead()) {
    		b.setToRead(false);
			BookmarkManager.UpdateBookmark(b, mAccount.name, this);
>>>>>>> 84af87db6b2e2d835220d9010c3e45a7c0026d2a
    	}
	}
Solution content 
    	}
    	if(b != null && isMyself() && b.getToRead()) {
    		b.setToRead(false);
			BookmarkManager.UpdateBookmark(b, mAccount.name, this);
	}

	public void onBookmarkMark(Bookmark b) {
	}
File
BrowseBookmarks.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
	}

	public void onBookmarkDelete(Bookmark b) {
<<<<<<< HEAD
		if(b != null){
			BookmarkTaskArgs args = new BookmarkTaskArgs(b, mAccount, this);	
			new DeleteBookmarkTask().execute(args);
			
			if(findViewById(R.id.maincontent) != null) {
				FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
				transaction.remove(getSupportFragmentManager().findFragmentById(R.id.maincontent));
				transaction.commit();
			}
		}
	}

	public void onViewTagSelected(String tag) {
		if(findViewById(R.id.maincontent) != null) {
			BrowseBookmarksFragment frag = new BrowseBookmarksFragment();
			frag.setQuery(username, tag, false);
			FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
			transaction.replace(R.id.listcontent, frag);
			transaction.addToBackStack(null);
			transaction.commit();
		} else {
			startActivity(IntentHelper.ViewBookmarks(tag, username, this));
		}
	}

	public void onUserTagSelected(String tag, String user) {
		if(findViewById(R.id.maincontent) != null) {
			BrowseBookmarkFeedFragment frag = new BrowseBookmarkFeedFragment();
			frag.setQuery(user, tag);
			FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
			transaction.replace(R.id.listcontent, frag);
			transaction.addToBackStack(null);
			transaction.commit();
		} else {
			startActivity(IntentHelper.ViewBookmarks(tag, user, this));
		}
	}

	public void onAccountSelected(String account) {
		if(findViewById(R.id.maincontent) != null) {
			BrowseBookmarkFeedFragment frag = new BrowseBookmarkFeedFragment();
			frag.setQuery(account, null);
			FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
			transaction.replace(R.id.listcontent, frag);
			transaction.addToBackStack(null);
			transaction.commit();
		} else {
			startActivity(IntentHelper.ViewBookmarks(null, account, this));
		}
	}

	public void onBookmarkSave(Bookmark b) {
		if(getSupportFragmentManager().findFragmentById(R.id.maincontent).isHidden()){
			FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
			transaction.hide(getSupportFragmentManager().findFragmentById(R.id.addcontent));
			transaction.show(getSupportFragmentManager().findFragmentById(R.id.maincontent));
			transaction.commit();
		}
		
		onBookmarkView(b);
	}

	public void onBookmarkCancel(Bookmark b) {
		if(getSupportFragmentManager().findFragmentById(R.id.maincontent).isHidden()){
			FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
			transaction.hide(getSupportFragmentManager().findFragmentById(R.id.addcontent));
			transaction.show(getSupportFragmentManager().findFragmentById(R.id.maincontent));
			transaction.commit();
		}
		
		onBookmarkView(b);
	}

	public void onTagSelected(String tag) {
		FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
		BrowseBookmarksFragment frag = new BrowseBookmarksFragment();
		frag.setQuery(username, tag, false);
		transaction.replace(R.id.listcontent, frag);
		transaction.commit();
	}
	
	private void setBookmarkView(Bookmark b, BookmarkViewType viewType){
		if(getSupportFragmentManager().findFragmentById(R.id.maincontent).isHidden() && getSupportFragmentManager().findFragmentById(R.id.addcontent).isHidden()){
			FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
			if(getSupportFragmentManager().findFragmentById(R.id.tagcontent).isVisible()){
				transaction.hide(getSupportFragmentManager().findFragmentById(R.id.tagcontent));
			}
			transaction.show(getSupportFragmentManager().findFragmentById(R.id.maincontent));
			transaction.addToBackStack(null);
			transaction.commit();
		} else if(getSupportFragmentManager().findFragmentById(R.id.maincontent).isHidden() && getSupportFragmentManager().findFragmentById(R.id.addcontent).isVisible()){
			FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
			transaction.hide(getSupportFragmentManager().findFragmentById(R.id.addcontent));
			transaction.show(getSupportFragmentManager().findFragmentById(R.id.maincontent));
			transaction.commit();
		}
		
		ViewBookmarkFragment viewFrag = (ViewBookmarkFragment) getSupportFragmentManager().findFragmentById(R.id.maincontent);
		viewFrag.setBookmark(b, viewType);
		viewFrag.loadBookmark();
=======
		BookmarkManager.LazyDelete(b, mAccount.name, this);
>>>>>>> 84af87db6b2e2d835220d9010c3e45a7c0026d2a
	}
}
Solution content 
	}

	public void onBookmarkDelete(Bookmark b) {
		BookmarkManager.LazyDelete(b, mAccount.name, this);
	}

	public void onViewTagSelected(String tag) {
		if(findViewById(R.id.maincontent) != null) {
			BrowseBookmarksFragment frag = new BrowseBookmarksFragment();
			frag.setQuery(username, tag, false);
			FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
			transaction.replace(R.id.listcontent, frag);
			transaction.addToBackStack(null);
			transaction.commit();
		} else {
			startActivity(IntentHelper.ViewBookmarks(tag, username, this));
		}
	}

	public void onUserTagSelected(String tag, String user) {
		if(findViewById(R.id.maincontent) != null) {
			BrowseBookmarkFeedFragment frag = new BrowseBookmarkFeedFragment();
			frag.setQuery(user, tag);
			FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
			transaction.replace(R.id.listcontent, frag);
			transaction.addToBackStack(null);
			transaction.commit();
		} else {
			startActivity(IntentHelper.ViewBookmarks(tag, user, this));
		}
	}

	public void onAccountSelected(String account) {
		if(findViewById(R.id.maincontent) != null) {
			BrowseBookmarkFeedFragment frag = new BrowseBookmarkFeedFragment();
			frag.setQuery(account, null);
			FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
			transaction.replace(R.id.listcontent, frag);
			transaction.addToBackStack(null);
			transaction.commit();
		} else {
			startActivity(IntentHelper.ViewBookmarks(null, account, this));
		}
	}

	public void onBookmarkSave(Bookmark b) {
		if(getSupportFragmentManager().findFragmentById(R.id.maincontent).isHidden()){
			FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
			transaction.hide(getSupportFragmentManager().findFragmentById(R.id.addcontent));
			transaction.show(getSupportFragmentManager().findFragmentById(R.id.maincontent));
			transaction.commit();
		}
		
		onBookmarkView(b);
	}

	public void onBookmarkCancel(Bookmark b) {
		if(getSupportFragmentManager().findFragmentById(R.id.maincontent).isHidden()){
			FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
			transaction.hide(getSupportFragmentManager().findFragmentById(R.id.addcontent));
			transaction.show(getSupportFragmentManager().findFragmentById(R.id.maincontent));
			transaction.commit();
		}
		
		onBookmarkView(b);
	}

	public void onTagSelected(String tag) {
		FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
		BrowseBookmarksFragment frag = new BrowseBookmarksFragment();
		frag.setQuery(username, tag, false);
		transaction.replace(R.id.listcontent, frag);
		transaction.commit();
	}
	
	private void setBookmarkView(Bookmark b, BookmarkViewType viewType){
		if(getSupportFragmentManager().findFragmentById(R.id.maincontent).isHidden() && getSupportFragmentManager().findFragmentById(R.id.addcontent).isHidden()){
			FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
			if(getSupportFragmentManager().findFragmentById(R.id.tagcontent).isVisible()){
				transaction.hide(getSupportFragmentManager().findFragmentById(R.id.tagcontent));
			}
			transaction.show(getSupportFragmentManager().findFragmentById(R.id.maincontent));
			transaction.addToBackStack(null);
			transaction.commit();
		} else if(getSupportFragmentManager().findFragmentById(R.id.maincontent).isHidden() && getSupportFragmentManager().findFragmentById(R.id.addcontent).isVisible()){
			FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
			transaction.hide(getSupportFragmentManager().findFragmentById(R.id.addcontent));
			transaction.show(getSupportFragmentManager().findFragmentById(R.id.maincontent));
			transaction.commit();
		}
		
		ViewBookmarkFragment viewFrag = (ViewBookmarkFragment) getSupportFragmentManager().findFragmentById(R.id.maincontent);
		viewFrag.setBookmark(b, viewType);
		viewFrag.loadBookmark();
	}
}
File
BrowseBookmarks.java
Developer's decision
Combination
Kind of conflict
Cast expression
If statement
Method declaration
Method invocation
Method signature
Variable
Chunk
Conflicting content 
import android.util.Log;

import com.pindroid.R;
<<<<<<< HEAD
import com.pindroid.Constants.BookmarkViewType;
import com.pindroid.action.BookmarkTaskArgs;
import com.pindroid.action.DeleteBookmarkTask;
=======
>>>>>>> 84af87db6b2e2d835220d9010c3e45a7c0026d2a
import com.pindroid.action.IntentHelper;
import com.pindroid.fragment.BrowseBookmarksFragment.OnBookmarkSelectedListener;
import com.pindroid.fragment.ViewBookmarkFragment;
Solution content 
import android.util.Log;

import com.pindroid.R;
import com.pindroid.Constants.BookmarkViewType;
import com.pindroid.action.IntentHelper;
import com.pindroid.fragment.BrowseBookmarksFragment.OnBookmarkSelectedListener;
import com.pindroid.fragment.ViewBookmarkFragment;
File
ViewBookmark.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
		}
	}
	
<<<<<<< HEAD
	public void onViewTagSelected(String tag) {		
		startActivity(IntentHelper.ViewBookmarks(tag, mAccount.name, this));
=======
	public void onTagSelected(String tag) {		
		startActivity(IntentHelper.ViewBookmarks(tag, username, this));

>>>>>>> 84af87db6b2e2d835220d9010c3e45a7c0026d2a
	}

	public void onUserTagSelected(String tag, String user) {
Solution content 
		}
	}
	
	public void onViewTagSelected(String tag) {		
		startActivity(IntentHelper.ViewBookmarks(tag, mAccount.name, this));

	}

	public void onUserTagSelected(String tag, String user) {
File
ViewBookmark.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Chunk
Conflicting content 
	private AsyncTask titleTask;
	private AsyncTask> tagTask;
	
<<<<<<< HEAD
	private OnBookmarkSaveListener bookmarkSaveListener;
	
	public interface OnBookmarkSaveListener {
		public void onBookmarkSave(Bookmark b);
		public void onBookmarkCancel(Bookmark b);
	}
	
=======
>>>>>>> 84af87db6b2e2d835220d9010c3e45a7c0026d2a
	@Override
	public void onActivityCreated(Bundle savedInstanceState){
		super.onActivityCreated(savedInstanceState);
Solution content 
	private AsyncTask titleTask;
	private AsyncTask> tagTask;
	
	private OnBookmarkSaveListener bookmarkSaveListener;
	
	public interface OnBookmarkSaveListener {
		public void onBookmarkSave(Bookmark b);
		public void onBookmarkCancel(Bookmark b);
	}
	
	@Override
	public void onActivityCreated(Bundle savedInstanceState){
		super.onActivityCreated(savedInstanceState);
File
AddBookmarkFragment.java
Developer's decision
Version 1
Kind of conflict
Attribute
Interface declaration
Chunk
Conflicting content 
		bookmarkSaveListener.onBookmarkSave(bookmark);
	}
	
<<<<<<< HEAD
	public void cancelHandler(View v) {
    	if(error) {
    		revertBookmark();
    	}
    	
    	bookmarkSaveListener.onBookmarkCancel(bookmark);
=======
	public void cancelHandler(View v) {    	
    	base.finish();
>>>>>>> 84af87db6b2e2d835220d9010c3e45a7c0026d2a
	}
	
	private void setDefaultValues(){
Solution content 
		bookmarkSaveListener.onBookmarkSave(bookmark);
	}
	
	public void cancelHandler(View v) {    	
    	bookmarkSaveListener.onBookmarkCancel(bookmark);
	}
	
	private void setDefaultValues(){
File
AddBookmarkFragment.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Method signature
Chunk
Conflicting content 
        	
			bookmarkSaveListener.onBookmarkSave(bookmark);
			return true;
	    case R.id.menu_addbookmark_cancel:
<<<<<<< HEAD
        	if(error) {
        		revertBookmark();
        	}
        	bookmarkSaveListener.onBookmarkCancel(bookmark);
=======
        	base.finish();
>>>>>>> 84af87db6b2e2d835220d9010c3e45a7c0026d2a
	        return true;
	    default:
	        return super.onOptionsItemSelected(item);
Solution content 
			bookmarkSaveListener.onBookmarkSave(bookmark);
			return true;
	    case R.id.menu_addbookmark_cancel:
        	bookmarkSaveListener.onBookmarkCancel(bookmark);
	        return true;
	    default:
	        return super.onOptionsItemSelected(item);
File
AddBookmarkFragment.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
				TagManager.BulkInsert(tagList, username, mContext);
			}

<<<<<<< HEAD
			if(!addBookmarkList.isEmpty()){
				BookmarkManager.BulkInsert(addBookmarkList, username, mContext);
			}
=======
>>>>>>> 84af87db6b2e2d835220d9010c3e45a7c0026d2a
            
            setServerSyncMarker(account, update.getLastUpdate());
Solution content 
				TagManager.BulkInsert(tagList, username, mContext);
			}

            
            setServerSyncMarker(account, update.getLastUpdate());
            
            setServerSyncMarker(account, update.getLastUpdate());
File
BookmarkSyncAdapter.java
Developer's decision
Manual
Kind of conflict
If statement