Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-06 21:58:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Send resulting image uri via native calls

Browse source
This commit is contained in:
Angela Mazzurco 2017-07-11 18:37:01 +02:00
parent 5838b13043
commit 8a59503260
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
retroshare-qml-app/src/android/src/org/retroshare/android/qml_app/RetroShareQmlActivity.java
View file

@ -102,8 +102,8 @@ public class RetroShareQmlActivity extends QtActivity
startActivityForResult( chooserIntent, PICK_PHOTO); startActivityForResult( chooserIntent, PICK_PHOTO);
}; };
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data)
{
Log.i("RetroShareQmlActivity", "onActivityResult()" + String.valueOf(requestCode)); Log.i("RetroShareQmlActivity", "onActivityResult()" + String.valueOf(requestCode));
if (resultCode == RESULT_OK) if (resultCode == RESULT_OK)
@ -119,22 +119,32 @@ public class RetroShareQmlActivity extends QtActivity
else else
{ {
final String action = data.getAction(); final String action = data.getAction();
if (action == null) { if (action == null)
{
isCamera = false; isCamera = false;
} else { }
else
{
isCamera = action.equals(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); isCamera = action.equals(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
} }
} }
Uri selectedImageUri; Uri selectedImageUri;
if (isCamera) { if (isCamera)
{
selectedImageUri = capturedImageURI; selectedImageUri = capturedImageURI;
} else { }
else
{
selectedImageUri = data == null ? null : data.getData(); selectedImageUri = data == null ? null : data.getData();
} }
Log.i("RetroShareQmlActivity", "Image uri found!" + selectedImageUri.toString()); String uri = selectedImageUri.toString();
if (uri != null)
{
Log.i("RetroShareQmlActivity", "Image uri found!" + uri);
NativeCalls.notifyIntentUri(uri);
}
} }
} }
} }

0
retroshare-qml-app/src/components/CustomFileChooser.qml Normal file
View file