| Chunk |
|---|
| Conflicting content |
|---|
@Override
public void bindView(View v, Context context, Cursor c) {
<<<<<<< HEAD
DbObject.bindView(v, context, c, mContactCache);
DBHelper helper = new DBHelper(context);
int feedCol = -1;
String[] cols = c.getColumnNames();
// There are two selected 'feed_name' columns, one can be null.
for (int i = 0; i < cols.length; i++) {
if (cols[i].equals(DbObject.FEED_NAME)) {
feedCol = i;
break;
}
}
String feedName = c.getString(feedCol);
helper.getWritableDatabase().execSQL("UPDATE "+Group.TABLE+" SET "+Group.NUM_UNREAD+" = 0 WHERE "+Group.FEED_NAME+"='"+feedName+"'");
helper.close();
context.getContentResolver().notifyChange(Uri.parse(DungBeetleContentProvider.CONTENT_URI + "/feedlist"), null);
=======
DbObject.bindView(v, context, c, mContactCache, true);
>>>>>>> f935fba97842960550d336437ad840ec49008e31
}
public static CursorLoader queryObjects(Context context, Uri feedUri) { |
| Solution content |
|---|
@Override
public void bindView(View v, Context context, Cursor c) {
DbObject.bindView(v, context, c, mContactCache, true);
DBHelper helper = new DBHelper(context);
int feedCol = -1;
String[] cols = c.getColumnNames();
// There are two selected 'feed_name' columns, one can be null.
for (int i = 0; i < cols.length; i++) {
if (cols[i].equals(DbObject.FEED_NAME)) {
feedCol = i;
break;
}
}
String feedName = c.getString(feedCol);
helper.getWritableDatabase().execSQL("UPDATE "+Group.TABLE+" SET "+Group.NUM_UNREAD+" = 0 WHERE "+Group.FEED_NAME+"='"+feedName+"'");
helper.close();
context.getContentResolver().notifyChange(Uri.parse(DungBeetleContentProvider.CONTENT_URI + "/feedlist"), null);
}
public static CursorLoader queryObjects(Context context, Uri feedUri) { |
| File |
|---|
| ObjectListCursorAdapter.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| For statement |
| Method invocation |
| Variable |