Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release' into dev

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt
#	app/src/main/java/com/gh/gamecenter/catalog/SubCatalogFragment.kt
This commit is contained in:
juntao
2021-02-27 10:58:57 +08:00
parent 078b102152 87be3bed61
commit 278dcc33be
10 changed files with 81 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/gh/gamecenter/SuggestionActivity.java
View File

@ -329,10 +329,9 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall
String[] filePathColumn = {MediaStore.Images.Media.DATA};
Cursor cursor = getContentResolver().query(selectedImage, filePathColumn, null, null, null);
if (cursor == null) {
if (cursor == null || !cursor.moveToFirst()) {
return;
}
cursor.moveToFirst();
int columnIndex = cursor.getColumnIndex(filePathColumn[0]);
String picturePath = cursor.getString(columnIndex);