Projects >> ProgrammingAndroidExamples >>5fc19efa07af3bb95c18d7294bc47b056abcb770

Chunk
Conflicting content 
import android.widget.TextView;

import com.finchframework.finch.Finch;
<<<<<<< HEAD
=======

>>>>>>> f93c51f3efd1207dfc91a17be588ae28f6de2998
import com.oreilly.demo.android.pa.finchvideo.provider.FinchVideo;

import java.io.FileNotFoundException;
Solution content 
import android.widget.TextView;
import com.finchframework.finch.Finch;
import com.oreilly.demo.android.pa.finchvideo.provider.FinchVideo;

import java.io.FileNotFoundException;
File
FinchVideoActivity.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
    // sends the query to the finch video content provider
    void query() {
<<<<<<< HEAD
        if (!searchEmpty()) {
            String queryString =
                    FinchVideo.Videos.QUERY_PARAM_NAME + "=" +
                            Uri.encode(mSearchText.getText().toString());
=======
        String searchText = getText();
        if (!searchEmpty(searchText)) {
            String queryString =
                FinchVideo.Videos.QUERY_PARAM_NAME + "=" +
                Uri.encode(searchText.toString());
>>>>>>> f93c51f3efd1207dfc91a17be588ae28f6de2998
            Uri queryUri =
                    Uri.parse(FinchVideo.Videos.CONTENT_URI + "?" +
                            queryString);
Solution content 
    // sends the query to the finch video content provider
    void query() {
        if (!searchEmpty()) {
            String queryString =
                    FinchVideo.Videos.QUERY_PARAM_NAME + "=" +
                            Uri.encode(mSearchText.getText().toString());
            Uri queryUri =
                    Uri.parse(FinchVideo.Videos.CONTENT_URI + "?" +
                            queryString);
File
FinchVideoActivity.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    private boolean searchEmpty() {
        Editable text = mSearchText.getText();
        if (text != null) {
            String textString = text.toString();
            return "".equals(textString);
        }
        return true;
=======
    private String getText() {
        Editable editable = mSearchText.getText();
        if (editable != null) {
            return editable.toString();
        }
        return null;
    }

    private boolean searchEmpty(String text) {
        return (text != null) && ("".equals(text));
>>>>>>> f93c51f3efd1207dfc91a17be588ae28f6de2998
    }
}
Solution content 
        }
    }

    private boolean searchEmpty() {
        Editable text = mSearchText.getText();
        if (text != null) {
            String textString = text.toString();
            return "".equals(textString);
        }
        return true;
    }
}
File
FinchVideoActivity.java
Developer's decision
Version 1
Kind of conflict
If statement
Method declaration
Method invocation
Method signature
Return statement
Variable