Projects >> android-arabic-reader >>7b8ebd2fe2db8a10385dd9d13d345ab5aae0d3fd

Chunk
Conflicting content 
import com.paragon.open.dictionary.api.*;

<<<<<<< HEAD
import net.sourceforge.arabicReader.R;
=======
import org.geometerplus.zlibrary.core.util.MiscUtil;
import org.geometerplus.zlibrary.ui.android.R;
>>>>>>> b259998391a4bdf58f6ad569cc6261652f5330eb

public class OpenDictionaryActivity extends Activity {
	public final static String OPEN_DICTIONARY_QUERY_KEY = "open_dictionary_query";
Solution content 
import com.paragon.open.dictionary.api.*;

import org.geometerplus.zlibrary.core.util.MiscUtil;
import net.sourceforge.arabicReader.R;

public class OpenDictionaryActivity extends Activity {
	public final static String OPEN_DICTIONARY_QUERY_KEY = "open_dictionary_query";
File
OpenDictionaryActivity.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
				@Override
				public void onComplete(String s, TranslateMode translateMode) {
					final String url = saveArticle(s.replace("", "

"), getApplicationContext());
<<<<<<< HEAD
					if (url == null || url.length() == 0)
=======
					if (MiscUtil.isEmptyString(url)) {
>>>>>>> b259998391a4bdf58f6ad569cc6261652f5330eb
						openTextInDictionary(myQuery);
					} else {
						myArticleView.loadUrl(url);
Solution content 
				@Override
				public void onComplete(String s, TranslateMode translateMode) {
					final String url = saveArticle(s.replace("", "

"), getApplicationContext());
					if (MiscUtil.isEmptyString(url)) {
						openTextInDictionary(myQuery);
					} else {
						myArticleView.loadUrl(url);
File
OpenDictionaryActivity.java
Developer's decision
Version 2
Kind of conflict
If statement