Merge remote-tracking branch 'origin/dev' into dev-5.13.0
# Conflicts: # app/src/main/java/com/gh/common/util/DetailDownloadUtils.java # app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityFragment.kt # app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt # app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt
This commit is contained in:
@ -161,8 +161,8 @@ public class DataUtils {
|
||||
values.put(GhContentProvider.KEY_IS_ADULT, false);
|
||||
}
|
||||
|
||||
new GhContentProvider().localInsert( HaloApp.getInstance().getApplication(),values);
|
||||
// HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/certification"), values);
|
||||
// new GhContentProvider().localInsert( HaloApp.getInstance().getApplication(),values);
|
||||
HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/certification"), values);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user