Skip to content

Commit 23b2b08

Browse files
committed
update error logs
1 parent 0da4c47 commit 23b2b08

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

android/src/main/java/com/reactnativeone/OneModule.java

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import java.util.ArrayList;
4141
import java.util.EnumSet;
4242
import java.util.HashMap;
43+
import java.util.Objects;
4344
import java.util.concurrent.CompletionException;
4445
import java.util.concurrent.ExecutionException;
4546
import java.util.concurrent.Executors;
@@ -97,7 +98,7 @@ public void sendInteraction(String interactionPath, ReadableMap propertiesMap, f
9798
WritableNativeMap responseMap = responseObjectToReadableMap(response);
9899
notifyResult(promise, responseMap);
99100
} catch (ExecutionException error) {
100-
notifyProblem(promise, Integer.toString(error.hashCode()), error.getLocalizedMessage());
101+
notifyProblem(promise, Integer.toString(error.hashCode()), Objects.requireNonNull(error.getCause()).getLocalizedMessage());
101102
Log.e(NAME, "[Thunderhead] Send Interaction Completion Error: " + error.getCause());
102103
} catch (OneSDKError error) {
103104
notifyProblem(promise, Integer.toString(error.getSystemCode()), error.getLocalizedMessage());
@@ -106,7 +107,7 @@ public void sendInteraction(String interactionPath, ReadableMap propertiesMap, f
106107
notifyProblem(promise, Integer.toString(error.getHttpStatusCode()), error.getLocalizedMessage());
107108
Log.e(NAME, "[Thunderhead] Send Interaction Api Error: " + error.getErrorMessage());
108109
} catch (CompletionException error) {
109-
notifyProblem(promise, Integer.toString(error.hashCode()), error.getLocalizedMessage());
110+
notifyProblem(promise, Integer.toString(error.hashCode()), Objects.requireNonNull(error.getCause()).getLocalizedMessage());
110111
Log.e(NAME, "[Thunderhead] Send Interaction Completion Error: " + error.getLocalizedMessage());
111112
} catch (Exception error) {
112113
notifyProblem(promise, Integer.toString(error.hashCode()), error.getLocalizedMessage());
@@ -118,7 +119,7 @@ public void sendInteraction(String interactionPath, ReadableMap propertiesMap, f
118119
WritableNativeMap responseMap = responseObjectToReadableMap(response);
119120
notifyResult(promise, responseMap);
120121
} catch (ExecutionException error) {
121-
notifyProblem(promise, Integer.toString(error.hashCode()), error.getLocalizedMessage());
122+
notifyProblem(promise, Integer.toString(error.hashCode()), Objects.requireNonNull(error.getCause()).getLocalizedMessage());
122123
Log.e(NAME, "[Thunderhead] Send Interaction Completion Error: " + error.getCause());
123124
} catch (OneSDKError error) {
124125
notifyProblem(promise, Integer.toString(error.getSystemCode()), error.getLocalizedMessage());
@@ -151,7 +152,7 @@ public void sendProperties(String interactionPath, ReadableMap propertiesMap, fi
151152
WritableNativeMap responseMap = responseObjectToReadableMap(response);
152153
notifyResult(promise, responseMap);
153154
} catch (ExecutionException error) {
154-
notifyProblem(promise, Integer.toString(error.hashCode()), error.getLocalizedMessage());
155+
notifyProblem(promise, Integer.toString(error.hashCode()), Objects.requireNonNull(error.getCause()).getLocalizedMessage());
155156
Log.e(NAME, "[Thunderhead] Send Properties Completion Error: " + error.getCause());
156157
} catch (OneSDKError error) {
157158
notifyProblem(promise, Integer.toString(error.getSystemCode()), error.getLocalizedMessage());
@@ -160,8 +161,8 @@ public void sendProperties(String interactionPath, ReadableMap propertiesMap, fi
160161
notifyProblem(promise, Integer.toString(error.getHttpStatusCode()), error.getLocalizedMessage());
161162
Log.e(NAME, "[Thunderhead] Send Properties Api Error: " + error.getErrorMessage());
162163
} catch (CompletionException error) {
163-
notifyProblem(promise, Integer.toString(error.hashCode()), error.getLocalizedMessage());
164-
Log.e(NAME, "[Thunderhead] Send Properties Completion Error: " + error.getLocalizedMessage());
164+
notifyProblem(promise, Integer.toString(error.hashCode()), Objects.requireNonNull(error.getCause()).getLocalizedMessage());
165+
Log.e(NAME, "[Thunderhead] Send Properties Completion Error: " + error.getCause());
165166
} catch (Exception error) {
166167
notifyProblem(promise, Integer.toString(error.hashCode()), error.getLocalizedMessage());
167168
Log.e(NAME, "[Thunderhead] Send Interaction Error: " + error.getLocalizedMessage());
@@ -173,7 +174,7 @@ public void sendProperties(String interactionPath, ReadableMap propertiesMap, fi
173174
WritableNativeMap responseMap = responseObjectToReadableMap(response);
174175
notifyResult(promise, responseMap);
175176
} catch (ExecutionException error) {
176-
notifyProblem(promise, Integer.toString(error.hashCode()), error.getLocalizedMessage());
177+
notifyProblem(promise, Integer.toString(error.hashCode()), Objects.requireNonNull(error.getCause()).getLocalizedMessage());
177178
Log.e(NAME, "[Thunderhead] Send Properties Completion Error: " + error.getCause());
178179
} catch (OneSDKError error) {
179180
notifyProblem(promise, Integer.toString(error.getSystemCode()), error.getLocalizedMessage());
@@ -201,7 +202,7 @@ public void sendResponseCode(String interactionPath, String responseCode, final
201202
One.sendResponseCode(THROW_ERRORS, responseCodeRequest).join();
202203
notifyResult(promise, null);
203204
} catch (ExecutionException error) {
204-
notifyProblem(promise, Integer.toString(error.hashCode()), error.getLocalizedMessage());
205+
notifyProblem(promise, Integer.toString(error.hashCode()), Objects.requireNonNull(error.getCause()).getLocalizedMessage());
205206
Log.e(NAME, "[Thunderhead] Send Response Code Completion Error: " + error.getCause());
206207
} catch (OneSDKError error) {
207208
notifyProblem(promise, Integer.toString(error.getSystemCode()), error.getLocalizedMessage());
@@ -210,8 +211,8 @@ public void sendResponseCode(String interactionPath, String responseCode, final
210211
notifyProblem(promise, Integer.toString(error.getHttpStatusCode()), error.getLocalizedMessage());
211212
Log.e(NAME, "[Thunderhead] Send Response Code Api Error: " + error.getErrorMessage());
212213
} catch (CompletionException error) {
213-
notifyProblem(promise, Integer.toString(error.hashCode()), error.getLocalizedMessage());
214-
Log.e(NAME, "[Thunderhead] Send Properties Completion Error: " + error.getLocalizedMessage());
214+
notifyProblem(promise, Integer.toString(error.hashCode()), Objects.requireNonNull(error.getCause()).getLocalizedMessage());
215+
Log.e(NAME, "[Thunderhead] Send Properties Completion Error: " + error.getCause());
215216
} catch (Exception error) {
216217
notifyProblem(promise, Integer.toString(error.hashCode()), error.getLocalizedMessage());
217218
Log.e(NAME, "[Thunderhead] Send Interaction Error: " + error.getLocalizedMessage());
@@ -221,7 +222,7 @@ public void sendResponseCode(String interactionPath, String responseCode, final
221222
One.sendResponseCodeLegacySupport(THROW_ERRORS, responseCodeRequest).join();
222223
notifyResult(promise, null);
223224
} catch (ExecutionException error) {
224-
notifyProblem(promise, Integer.toString(error.hashCode()), error.getLocalizedMessage());
225+
notifyProblem(promise, Integer.toString(error.hashCode()), Objects.requireNonNull(error.getCause()).getLocalizedMessage());
225226
Log.e(NAME, "[Thunderhead] Send Response Code Completion Error: " + error.getCause());
226227
} catch (OneSDKError error) {
227228
notifyProblem(promise, Integer.toString(error.getSystemCode()), error.getLocalizedMessage());
@@ -251,7 +252,7 @@ public void enableLogging(Boolean enabled) {
251252

252253
OneLoggingConfiguration.Builder builder = OneLoggingConfiguration.builder().log(OneLogComponent.ANY);
253254
if (enabled) {
254-
builder.log(OneLogLevel.VERBOSE).log(OneLogLevel.DEBUG);
255+
builder.log(OneLogLevel.VERBOSE);
255256
} else {
256257
builder.log(OneLogLevel.WARN).log(OneLogLevel.ERROR);
257258
}

0 commit comments

Comments
 (0)