|
|
@ -479,9 +479,8 @@ public class FragmentSetup extends FragmentBase {
|
|
|
|
super.onActivityResult(requestCode, resultCode, data);
|
|
|
|
super.onActivityResult(requestCode, resultCode, data);
|
|
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
if (requestCode == ActivitySetup.REQUEST_STILL && resultCode != Activity.RESULT_OK)
|
|
|
|
if (requestCode == ActivitySetup.REQUEST_STILL)
|
|
|
|
((FragmentBase) getParentFragment()).finish();
|
|
|
|
if (resultCode == Activity.RESULT_OK) {
|
|
|
|
else {
|
|
|
|
|
|
|
|
boolean hasPermissions = hasPermission(Manifest.permission.READ_CONTACTS);
|
|
|
|
boolean hasPermissions = hasPermission(Manifest.permission.READ_CONTACTS);
|
|
|
|
Boolean isIgnoring = Helper.isIgnoringOptimizations(getContext());
|
|
|
|
Boolean isIgnoring = Helper.isIgnoringOptimizations(getContext());
|
|
|
|
|
|
|
|
|
|
|
@ -499,7 +498,8 @@ public class FragmentSetup extends FragmentBase {
|
|
|
|
view.scrollTo(0, top);
|
|
|
|
view.scrollTo(0, top);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
|
|
|
|
((FragmentBase) getParentFragment()).finish();
|
|
|
|
} catch (Throwable ex) {
|
|
|
|
} catch (Throwable ex) {
|
|
|
|
Log.e(ex);
|
|
|
|
Log.e(ex);
|
|
|
|
}
|
|
|
|
}
|
|
|
|