Skip to content

Commit b6a193b

Browse files
committed
Code review
1 parent 8eca854 commit b6a193b

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

android/src/main/java/com/proyecto26/inappbrowser/ChromeTabsManagerActivity.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public class ChromeTabsManagerActivity extends Activity {
2020

2121
private boolean mOpened = false;
2222
private String resultType = null;
23+
private boolean isError = false;
2324

2425
public static Intent createStartIntent(Context context, Intent authIntent) {
2526
Intent intent = createBaseIntent(context);
@@ -56,7 +57,8 @@ protected void onCreate(Bundle savedInstanceState) {
5657
finish();
5758
}
5859
} catch (Exception e) {
59-
EventBus.getDefault().post(new ChromeTabsDismissedEvent("Unable to open url.", "cancel", true));
60+
isError = true;
61+
EventBus.getDefault().post(new ChromeTabsDismissedEvent("Unable to open url.", resultType, isError));
6062
finish();
6163
e.printStackTrace();
6264
}
@@ -82,10 +84,10 @@ protected void onDestroy() {
8284
if (resultType != null) {
8385
switch (resultType) {
8486
case "cancel":
85-
EventBus.getDefault().post(new ChromeTabsDismissedEvent("chrome tabs activity closed", resultType, false));
87+
EventBus.getDefault().post(new ChromeTabsDismissedEvent("chrome tabs activity closed", resultType, isError));
8688
break;
8789
default:
88-
EventBus.getDefault().post(new ChromeTabsDismissedEvent("chrome tabs activity destroyed", DEFAULT_RESULT_TYPE, false));
90+
EventBus.getDefault().post(new ChromeTabsDismissedEvent("chrome tabs activity destroyed", DEFAULT_RESULT_TYPE, isError));
8991
break;
9092
}
9193
resultType = null;

android/src/main/java/com/proyecto26/inappbrowser/RNInAppBrowser.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ public void open(Context context, final ReadableMap options, final Promise promi
187187
} catch (Exception e) {
188188
e.printStackTrace();
189189
}
190+
191+
registerEventBus();
190192

191193
intent.setData(Uri.parse(url));
192194
if (options.hasKey(KEY_SHOW_PAGE_TITLE)) {
@@ -196,8 +198,6 @@ public void open(Context context, final ReadableMap options, final Promise promi
196198
intent.putExtra(CustomTabsIntent.EXTRA_TITLE_VISIBILITY_STATE, CustomTabsIntent.NO_TITLE);
197199
}
198200

199-
registerEventBus();
200-
201201
currentActivity.startActivity(
202202
ChromeTabsManagerActivity.createStartIntent(currentActivity, intent),
203203
customTabsIntent.startAnimationBundle);
@@ -243,6 +243,7 @@ public void onEvent(ChromeTabsDismissedEvent event) {
243243
} else {
244244
WritableMap result = Arguments.createMap();
245245
result.putString("type", event.resultType);
246+
result.putString("message", event.message);
246247
mOpenBrowserPromise.resolve(result);
247248
}
248249
mOpenBrowserPromise = null;

example/App.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ export default class App extends Component<ComponentState> {
9696
Linking.openURL(url);
9797
}
9898
} catch (error) {
99-
Alert.alert(error.message);
99+
console.error(error);
100+
Alert.alert(error.message || error);
100101
} finally {
101102
// Restore the previous StatusBar of the App
102103
StatusBar.setBarStyle(statusBarStyle);

0 commit comments

Comments
 (0)