Mirrors/FossifyGallery
2
0
Fork 1
mirror of https://github.com/FossifyOrg/Gallery.git synced 2025-02-23 13:44:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

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