Projects >> QuasselDroid >>9dba841959af3fa03b618a4ac14e86af6925ef3c

Chunk
Conflicting content 
import android.preference.PreferenceManager;
import android.util.Log;

<<<<<<< HEAD:src/com/lekebilen/quasseldroid/io/CoreConnection.java
import com.lekebilen.quasseldroid.Buffer;
import com.lekebilen.quasseldroid.BufferCollection;
import com.lekebilen.quasseldroid.BufferInfo;
import com.lekebilen.quasseldroid.IrcMessage;
import com.lekebilen.quasseldroid.IrcUser;
import com.lekebilen.quasseldroid.R;
import com.lekebilen.quasseldroid.io.CustomTrustManager.NewCertificateException;
import com.lekebilen.quasseldroid.qtcomm.EmptyQVariantException;
import com.lekebilen.quasseldroid.qtcomm.QDataInputStream;
import com.lekebilen.quasseldroid.qtcomm.QDataOutputStream;
import com.lekebilen.quasseldroid.qtcomm.QMetaType;
import com.lekebilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.lekebilen.quasseldroid.qtcomm.QVariant;
import com.lekebilen.quasseldroid.qtcomm.QVariantType;
import com.lekebilen.quasseldroid.service.CoreConnService;
=======
import com.iskrembilen.quasseldroid.Buffer;
import com.iskrembilen.quasseldroid.BufferCollection;
import com.iskrembilen.quasseldroid.BufferInfo;
import com.iskrembilen.quasseldroid.IrcMessage;
import com.iskrembilen.quasseldroid.IrcUser;
import com.iskrembilen.quasseldroid.io.CustomTrustManager.NewCertificateException;
import com.iskrembilen.quasseldroid.qtcomm.QDataInputStream;
import com.iskrembilen.quasseldroid.qtcomm.QDataOutputStream;
import com.iskrembilen.quasseldroid.qtcomm.QMetaType;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.iskrembilen.quasseldroid.qtcomm.QVariant;
import com.iskrembilen.quasseldroid.qtcomm.QVariantType;
import com.iskrembilen.quasseldroid.service.CoreConnService;
import com.iskrembilen.quasseldroid.R;
>>>>>>> 1ab12605de58eb0d6ac587d793e0c87a947574db:src/com/iskrembilen/quasseldroid/io/CoreConnection.java

public class CoreConnection {
	@SuppressWarnings("unused")
Solution content 
import android.preference.PreferenceManager;
import android.util.Log;

import com.iskrembilen.quasseldroid.Buffer;
import com.iskrembilen.quasseldroid.BufferCollection;
import com.iskrembilen.quasseldroid.BufferInfo;
import com.iskrembilen.quasseldroid.IrcMessage;
import com.iskrembilen.quasseldroid.IrcUser;
import com.iskrembilen.quasseldroid.R;
import com.iskrembilen.quasseldroid.io.CustomTrustManager.NewCertificateException;
import com.iskrembilen.quasseldroid.qtcomm.QDataInputStream;
import com.iskrembilen.quasseldroid.qtcomm.QDataOutputStream;
import com.iskrembilen.quasseldroid.qtcomm.QMetaType;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.iskrembilen.quasseldroid.qtcomm.QVariant;
import com.iskrembilen.quasseldroid.qtcomm.QVariantType;
import com.iskrembilen.quasseldroid.service.CoreConnService;
import com.lekebilen.quasseldroid.qtcomm.EmptyQVariantException;

public class CoreConnection {
	@SuppressWarnings("unused")
File
CoreConnection.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.ArrayList;
import java.util.List;

<<<<<<< HEAD:src/com/lekebilen/quasseldroid/qtcomm/serializers/QList.java
import com.lekebilen.quasseldroid.qtcomm.DataStreamVersion;
import com.lekebilen.quasseldroid.qtcomm.EmptyQVariantException;
import com.lekebilen.quasseldroid.qtcomm.QDataInputStream;
import com.lekebilen.quasseldroid.qtcomm.QDataOutputStream;
import com.lekebilen.quasseldroid.qtcomm.QMetaType;
import com.lekebilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.lekebilen.quasseldroid.qtcomm.QMetaTypeSerializer;
import com.lekebilen.quasseldroid.qtcomm.QVariant;
=======
import com.iskrembilen.quasseldroid.qtcomm.DataStreamVersion;
import com.iskrembilen.quasseldroid.qtcomm.QDataInputStream;
import com.iskrembilen.quasseldroid.qtcomm.QDataOutputStream;
import com.iskrembilen.quasseldroid.qtcomm.QMetaType;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeSerializer;
import com.iskrembilen.quasseldroid.qtcomm.QVariant;
>>>>>>> 1ab12605de58eb0d6ac587d793e0c87a947574db:src/com/iskrembilen/quasseldroid/qtcomm/serializers/QList.java

public class QList implements QMetaTypeSerializer> {
	String elementType;
Solution content 
import java.util.ArrayList;
import java.util.List;

import com.iskrembilen.quasseldroid.qtcomm.DataStreamVersion;
import com.iskrembilen.quasseldroid.qtcomm.QDataInputStream;
import com.iskrembilen.quasseldroid.qtcomm.QDataOutputStream;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeSerializer;
import com.lekebilen.quasseldroid.qtcomm.EmptyQVariantException;

public class QList implements QMetaTypeSerializer> {
	String elementType;
File
QList.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.HashMap;
import java.util.Map;

<<<<<<< HEAD:src/com/lekebilen/quasseldroid/qtcomm/serializers/QMap.java
import com.lekebilen.quasseldroid.qtcomm.DataStreamVersion;
import com.lekebilen.quasseldroid.qtcomm.EmptyQVariantException;
import com.lekebilen.quasseldroid.qtcomm.QDataInputStream;
import com.lekebilen.quasseldroid.qtcomm.QDataOutputStream;
import com.lekebilen.quasseldroid.qtcomm.QMetaType;
import com.lekebilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.lekebilen.quasseldroid.qtcomm.QMetaTypeSerializer;
import com.lekebilen.quasseldroid.qtcomm.QVariant;
=======
import com.iskrembilen.quasseldroid.qtcomm.DataStreamVersion;
import com.iskrembilen.quasseldroid.qtcomm.QDataInputStream;
import com.iskrembilen.quasseldroid.qtcomm.QDataOutputStream;
import com.iskrembilen.quasseldroid.qtcomm.QMetaType;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeSerializer;
import com.iskrembilen.quasseldroid.qtcomm.QVariant;
>>>>>>> 1ab12605de58eb0d6ac587d793e0c87a947574db:src/com/iskrembilen/quasseldroid/qtcomm/serializers/QMap.java

public class QMap implements QMetaTypeSerializer> {
	String keyType;
Solution content 
import java.util.HashMap;
import java.util.Map;

import com.iskrembilen.quasseldroid.qtcomm.DataStreamVersion;
import com.iskrembilen.quasseldroid.qtcomm.QDataInputStream;
import com.iskrembilen.quasseldroid.qtcomm.QDataOutputStream;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeSerializer;
import com.lekebilen.quasseldroid.qtcomm.EmptyQVariantException;

public class QMap implements QMetaTypeSerializer> {
	String keyType;
File
QMap.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import java.io.IOException;
import java.nio.ByteBuffer;

<<<<<<< HEAD:src/com/lekebilen/quasseldroid/qtcomm/serializers/quassel/BufferInfoSerializer.java
import com.lekebilen.quasseldroid.BufferInfo;
import com.lekebilen.quasseldroid.qtcomm.DataStreamVersion;
import com.lekebilen.quasseldroid.qtcomm.EmptyQVariantException;
import com.lekebilen.quasseldroid.qtcomm.QDataInputStream;
import com.lekebilen.quasseldroid.qtcomm.QDataOutputStream;
import com.lekebilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.lekebilen.quasseldroid.qtcomm.QMetaTypeSerializer;
=======
import com.iskrembilen.quasseldroid.BufferInfo;
import com.iskrembilen.quasseldroid.qtcomm.DataStreamVersion;
import com.iskrembilen.quasseldroid.qtcomm.QDataInputStream;
import com.iskrembilen.quasseldroid.qtcomm.QDataOutputStream;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeSerializer;
>>>>>>> 1ab12605de58eb0d6ac587d793e0c87a947574db:src/com/iskrembilen/quasseldroid/qtcomm/serializers/quassel/BufferInfoSerializer.java

public class BufferInfoSerializer implements QMetaTypeSerializer {
Solution content 
import java.io.IOException;

import com.iskrembilen.quasseldroid.BufferInfo;
import com.iskrembilen.quasseldroid.qtcomm.DataStreamVersion;
import com.iskrembilen.quasseldroid.qtcomm.QDataInputStream;
import com.iskrembilen.quasseldroid.qtcomm.QDataOutputStream;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeSerializer;
import com.lekebilen.quasseldroid.qtcomm.EmptyQVariantException;

public class BufferInfoSerializer implements QMetaTypeSerializer {
File
BufferInfoSerializer.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import android.text.Spannable;
import android.text.SpannableString;

<<<<<<< HEAD:src/com/lekebilen/quasseldroid/qtcomm/serializers/quassel/MessageSerializer.java
import com.lekebilen.quasseldroid.BufferInfo;
import com.lekebilen.quasseldroid.IrcMessage;
import com.lekebilen.quasseldroid.qtcomm.DataStreamVersion;
import com.lekebilen.quasseldroid.qtcomm.EmptyQVariantException;
import com.lekebilen.quasseldroid.qtcomm.QDataInputStream;
import com.lekebilen.quasseldroid.qtcomm.QDataOutputStream;
import com.lekebilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.lekebilen.quasseldroid.qtcomm.QMetaTypeSerializer;
=======
import com.iskrembilen.quasseldroid.BufferInfo;
import com.iskrembilen.quasseldroid.IrcMessage;
import com.iskrembilen.quasseldroid.qtcomm.DataStreamVersion;
import com.iskrembilen.quasseldroid.qtcomm.QDataInputStream;
import com.iskrembilen.quasseldroid.qtcomm.QDataOutputStream;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeSerializer;
>>>>>>> 1ab12605de58eb0d6ac587d793e0c87a947574db:src/com/iskrembilen/quasseldroid/qtcomm/serializers/quassel/MessageSerializer.java

public class MessageSerializer implements QMetaTypeSerializer {
Solution content 
import android.text.SpannableString;

import com.iskrembilen.quasseldroid.BufferInfo;
import com.iskrembilen.quasseldroid.IrcMessage;
import com.iskrembilen.quasseldroid.qtcomm.DataStreamVersion;
import com.iskrembilen.quasseldroid.qtcomm.QDataInputStream;
import com.iskrembilen.quasseldroid.qtcomm.QDataOutputStream;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeSerializer;
import com.lekebilen.quasseldroid.qtcomm.EmptyQVariantException;

public class MessageSerializer implements QMetaTypeSerializer {
File
MessageSerializer.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import java.io.IOException;
import java.util.Map;

<<<<<<< HEAD:src/com/lekebilen/quasseldroid/qtcomm/serializers/quassel/NetworkServerSerializer.java
import com.lekebilen.quasseldroid.NetworkServer;
import com.lekebilen.quasseldroid.qtcomm.DataStreamVersion;
import com.lekebilen.quasseldroid.qtcomm.EmptyQVariantException;
import com.lekebilen.quasseldroid.qtcomm.QDataInputStream;
import com.lekebilen.quasseldroid.qtcomm.QDataOutputStream;
import com.lekebilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.lekebilen.quasseldroid.qtcomm.QMetaTypeSerializer;
import com.lekebilen.quasseldroid.qtcomm.QVariant;
=======
import com.iskrembilen.quasseldroid.NetworkServer;
import com.iskrembilen.quasseldroid.qtcomm.DataStreamVersion;
import com.iskrembilen.quasseldroid.qtcomm.QDataInputStream;
import com.iskrembilen.quasseldroid.qtcomm.QDataOutputStream;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeSerializer;
import com.iskrembilen.quasseldroid.qtcomm.QVariant;
>>>>>>> 1ab12605de58eb0d6ac587d793e0c87a947574db:src/com/iskrembilen/quasseldroid/qtcomm/serializers/quassel/NetworkServerSerializer.java

public class NetworkServerSerializer implements QMetaTypeSerializer {
Solution content 
import java.io.IOException;
import java.util.Map;

import com.iskrembilen.quasseldroid.NetworkServer;
import com.iskrembilen.quasseldroid.qtcomm.DataStreamVersion;
import com.iskrembilen.quasseldroid.qtcomm.QDataInputStream;
import com.iskrembilen.quasseldroid.qtcomm.QDataOutputStream;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeRegistry;
import com.iskrembilen.quasseldroid.qtcomm.QMetaTypeSerializer;
import com.iskrembilen.quasseldroid.qtcomm.QVariant;
import com.lekebilen.quasseldroid.qtcomm.EmptyQVariantException;

public class NetworkServerSerializer implements QMetaTypeSerializer {
File
NetworkServerSerializer.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
	 *            are we connected to a core or not
	 */
	private void showNotification(boolean connected) {
<<<<<<< HEAD:src/com/lekebilen/quasseldroid/service/CoreConnService.java
		// TODO: Remove when "leaving" the application
		CharSequence text = "";
=======
		//TODO: Remove when "leaving" the application
		CharSequence text =  "";
		int temp_flags = 0; 
>>>>>>> 1ab12605de58eb0d6ac587d793e0c87a947574db:src/com/iskrembilen/quasseldroid/service/CoreConnService.java
		int icon;
		if (connected) {
			text = getText(R.string.notification_connected);
Solution content 
	 *            are we connected to a core or not
	 */
	private void showNotification(boolean connected) {
		//TODO: Remove when "leaving" the application
		CharSequence text =  "";
		int temp_flags = 0; 
		int icon;
		if (connected) {
			text = getText(R.string.notification_connected);
File
CoreConnService.java
Developer's decision
Version 2
Kind of conflict
Comment
Variable
Chunk
Conflicting content 
			temp_flags = Notification.FLAG_ONLY_ALERT_ONCE;
		}
		// Set the icon, scrolling text and timestamp
<<<<<<< HEAD:src/com/lekebilen/quasseldroid/service/CoreConnService.java
		Notification notification = new Notification(icon, text,
				System.currentTimeMillis());
		notification.flags |= Notification.FLAG_ONGOING_EVENT;
		// The PendingIntent to launch our activity if the user selects this
		// notification
=======
		Notification notification = new Notification(icon, text, System.currentTimeMillis());
		notification.flags |= temp_flags;
		// The PendingIntent to launch our activity if the user selects this notification
>>>>>>> 1ab12605de58eb0d6ac587d793e0c87a947574db:src/com/iskrembilen/quasseldroid/service/CoreConnService.java
		PendingIntent contentIntent;

		// TODO: Fix so that if a chat is currently on top, launch that one,
Solution content 
			temp_flags = Notification.FLAG_ONLY_ALERT_ONCE;
		}
		// Set the icon, scrolling text and timestamp
		Notification notification = new Notification(icon, text, System.currentTimeMillis());
		notification.flags |= temp_flags;
		// The PendingIntent to launch our activity if the user selects this notification
		PendingIntent contentIntent;

		// TODO: Fix so that if a chat is currently on top, launch that one,
File
CoreConnService.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
		return bufferCollection.getBuffer(bufferId);
	}

<<<<<<< HEAD:src/com/lekebilen/quasseldroid/service/CoreConnService.java
	public void getMoreBacklog(int bufferId, int amount) {
		Log.d(TAG, "GETING MORE BACKLOG");
=======
	public void getMoreBacklog(int bufferId, int amount){
		Log.d(TAG, "GEtTING MORE BACKLOG");
>>>>>>> 1ab12605de58eb0d6ac587d793e0c87a947574db:src/com/iskrembilen/quasseldroid/service/CoreConnService.java
		coreConn.requestMoreBacklog(bufferId, amount);
	}
Solution content 
		return bufferCollection.getBuffer(bufferId);
	}

	public void getMoreBacklog(int bufferId, int amount){
		Log.d(TAG, "Fetching more backlog");
		coreConn.requestMoreBacklog(bufferId, amount);
	}
File
CoreConnService.java
Developer's decision
Manual
Kind of conflict
Method invocation
Method signature
Chunk
Conflicting content 
					 */
					checkMessageForHighlight(buffer, message);
					checkForURL(message);
<<<<<<< HEAD:src/com/lekebilen/quasseldroid/service/CoreConnService.java
					// parseColorCodes(message);
					buffer.addBacklogMessage(message);
				} else {
					Log.e(TAG,
							"Getting message buffer already have "
									+ buffer.getInfo().name);
=======
					buffer.addBacklogMessage(message);	
				}else {
					Log.e(TAG, "Getting message buffer already have "+ buffer.getInfo().name + " " + message.messageId);
>>>>>>> 1ab12605de58eb0d6ac587d793e0c87a947574db:src/com/iskrembilen/quasseldroid/service/CoreConnService.java
				}
				break;
			case R.id.CORECONNECTION_NEW_MESSAGE_TO_SERVICE:
Solution content 
					 */
					checkMessageForHighlight(buffer, message);
					checkForURL(message);
					// parseColorCodes(message);
					buffer.addBacklogMessage(message);
				} else {
					Log.e(TAG,
							"Getting message buffer already have "
									+ buffer.getInfo().name);
				}
				break;
			case R.id.CORECONNECTION_NEW_MESSAGE_TO_SERVICE:
File
CoreConnService.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
					statusReceiver.send(
							CoreConnService.CONNECTION_NEW_CERTIFICATE, bundle);
				}
<<<<<<< HEAD:src/com/lekebilen/quasseldroid/service/CoreConnService.java

=======
				break;
			case R.id.CORECONNECTION_SET_BUFFER_ACTIVE:
				/**
				 * Set buffer as active or parted
				 */
				bufferCollection.getBuffer(msg.arg1).setActive((Boolean)msg.obj);
>>>>>>> 1ab12605de58eb0d6ac587d793e0c87a947574db:src/com/iskrembilen/quasseldroid/service/CoreConnService.java
			}
		}
	}
Solution content 
					statusReceiver.send(
							CoreConnService.CONNECTION_NEW_CERTIFICATE, bundle);
				}
				break;
			case R.id.CORECONNECTION_SET_BUFFER_ACTIVE:
				/**
				 * Set buffer as active or parted
				 */
				bufferCollection.getBuffer(msg.arg1).setActive((Boolean)msg.obj);
			}
		}
	}
File
CoreConnService.java
Developer's decision
Version 2
Kind of conflict
Break statement
Case statement
Comment
Method invocation