wbrawner/Simple-Gallery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename intent data to resultdata

Browse source
This commit is contained in:
tibbi 2016-11-12 23:45:40 +01:00
parent 8ccb0385ca
commit eb218f6fa6
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
View file

@ -406,11 +406,11 @@ public class MainActivity extends SimpleActivity
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
protected void onActivityResult(int requestCode, int resultCode, Intent resultData) {
if (resultCode == RESULT_OK) {
if (requestCode == PICK_MEDIA && data != null) {
if (requestCode == PICK_MEDIA && resultData != null) {
final Intent result = new Intent();
final String path = data.getData().getPath();
final String path = resultData.getData().getPath();
final Uri uri = Uri.fromFile(new File(path));
if (mIsGetImageContentIntent || mIsGetVideoContentIntent || mIsGetAnyContentIntent) {
final String type = Utils.Companion.getMimeType(path);
@ -428,7 +428,7 @@ public class MainActivity extends SimpleActivity
finish();
}
}
super.onActivityResult(requestCode, resultCode, data);
super.onActivityResult(requestCode, resultCode, resultData);
}
@Override

8
app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt
View file

@ -87,14 +87,14 @@ class SetWallpaperActivity : SimpleActivity(), CropImageView.OnCropImageComplete
}
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
if (requestCode == PICK_IMAGE) {
if (resultCode == Activity.RESULT_OK && data != null) {
handleImage(data)
if (resultCode == Activity.RESULT_OK && resultData != null) {
handleImage(resultData)
} else {
finish()
}
}
super.onActivityResult(requestCode, resultCode, data)
super.onActivityResult(requestCode, resultCode, resultData)
}
}