lubuwest/Friendiqa
1
2
Fork 1
Code Issues 9 Pull requests Releases 19 Wiki Activity

Friendiqa v0.3

Browse source
This commit is contained in:
LubuWest 2018-07-01 15:09:21 +02:00
commit bda2d9f7b5
63 changed files with 2746 additions and 1357 deletions
Download patch file Download diff file Expand all files Collapse all files

1
source-android/androidnative.pri/java/src/androidnative/AndroidNativeActivity.java
View file

@ -21,7 +21,6 @@ public class AndroidNativeActivity extends org.qtproject.qt5.android.bindings.Qt
protected void onResume() {
super.onResume();
if((getIntent().getFlags() == (Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY)) || (getIntent().getFlags() == Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) || (getIntent().getFlags() == Intent.FLAG_ACTIVITY_NEW_TASK) || (getIntent().getFlags() == Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED) || (getIntent().getFlags() == (Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED))) {
SystemDispatcher.onActivityResume();
} else {

2
source-android/androidnative.pri/java/src/androidnative/SystemDispatcher.java
View file

@ -135,7 +135,7 @@ public class SystemDispatcher {
message.put("requestCode",requestCode);
message.put("resultCode",resultCode);
message.put("data",data);
Log.d(TAG,"onActivityResult" + isInitialized);
if(isInitialized) {
dispatch(ACTIVITY_RESULT_MESSAGE,message);
waitingIntent=null;