Skip to content

Commit

Permalink
chore: Code formatting in provider sourcecode (#130)
Browse files Browse the repository at this point in the history
  • Loading branch information
@miquelbeltran
miquelbeltran authored Dec 12, 2024
1 parent cd8abee commit d690e7e
Show file tree
Hide file tree
Showing 32 changed files with 414 additions and 366 deletions.
78 changes: 40 additions & 38 deletions provider/src/main/java/com/raygun/raygun4android/CrashReporting.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import android.content.ComponentName;
import android.content.Intent;
import android.os.Build;

import com.google.gson.Gson;
import com.raygun.raygun4android.logging.RaygunLogger;
import com.raygun.raygun4android.messages.crashreporting.RaygunBreadcrumbMessage;
Expand All @@ -12,6 +13,7 @@
import com.raygun.raygun4android.utils.RaygunFileFilter;
import com.raygun.raygun4android.utils.RaygunFileUtils;
import com.raygun.raygun4android.utils.RaygunUtils;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
Expand All @@ -27,7 +29,7 @@ public class CrashReporting {
private static CrashReportingOnBeforeSend onBeforeSend;
private static List tags;
private static Map customData;
private static List<RaygunBreadcrumbMessage> breadcrumbs = new ArrayList<>();
private static final List<RaygunBreadcrumbMessage> breadcrumbs = new ArrayList<>();
private static boolean shouldProcessBreadcrumbLocation = false;

static RaygunUncaughtExceptionHandler getExceptionHandler() {
Expand Down Expand Up @@ -68,7 +70,7 @@ static void clearBreadcrumbs() {
}

private static RaygunBreadcrumbMessage processBreadcrumbLocation(
RaygunBreadcrumbMessage breadcrumb, boolean shouldProcessBreadcrumbLocation) {
RaygunBreadcrumbMessage breadcrumb, boolean shouldProcessBreadcrumbLocation) {

if (shouldProcessBreadcrumbLocation && breadcrumb.getClassName() == null) {

Expand All @@ -81,7 +83,7 @@ private static RaygunBreadcrumbMessage processBreadcrumbLocation(
StackTraceElement nextFrame = trace[i + 1];

if (thisFrame.getClassName().contains("com.raygun.raygun4android.")
&& !nextFrame.getClassName().contains("com.raygun.raygun4android.")) {
&& !nextFrame.getClassName().contains("com.raygun.raygun4android.")) {
frame = nextFrame;
break;
}
Expand All @@ -90,13 +92,13 @@ private static RaygunBreadcrumbMessage processBreadcrumbLocation(

if (frame != null) {
return new RaygunBreadcrumbMessage.Builder(breadcrumb.getMessage())
.category(breadcrumb.getCategory())
.customData(breadcrumb.getCustomData())
.level(breadcrumb.getLevel())
.className(frame.getClassName())
.methodName(frame.getMethodName())
.lineNumber(frame.getLineNumber())
.build();
.category(breadcrumb.getCategory())
.customData(breadcrumb.getCustomData())
.level(breadcrumb.getLevel())
.className(frame.getClassName())
.methodName(frame.getMethodName())
.lineNumber(frame.getLineNumber())
.build();
}
}

Expand Down Expand Up @@ -139,23 +141,23 @@ static void send(Throwable throwable, List tags, Map customData) {
postCachedMessages();
} else {
RaygunLogger.w(
"Crash Reporting is not enabled, please enable to use the send() function");
"Crash Reporting is not enabled, please enable to use the send() function");
}
}

private static RaygunMessage buildMessage(Throwable throwable) {
try {
RaygunMessage msg =
RaygunMessageBuilder.instance()
.setEnvironmentDetails(RaygunClient.getApplicationContext())
.setMachineName(Build.MODEL)
.setExceptionDetails(throwable)
.setClientDetails()
.setAppContext(RaygunClient.getAppContextIdentifier())
.setVersion(RaygunClient.getVersion())
.setNetworkInfo(RaygunClient.getApplicationContext())
.setBreadcrumbs(breadcrumbs)
.build();
RaygunMessageBuilder.instance()
.setEnvironmentDetails(RaygunClient.getApplicationContext())
.setMachineName(Build.MODEL)
.setExceptionDetails(throwable)
.setClientDetails()
.setAppContext(RaygunClient.getAppContextIdentifier())
.setVersion(RaygunClient.getVersion())
.setNetworkInfo(RaygunClient.getApplicationContext())
.setBreadcrumbs(breadcrumbs)
.build();

if (RaygunClient.getVersion() != null) {
msg.getDetails().setVersion(RaygunClient.getVersion());
Expand Down Expand Up @@ -185,24 +187,24 @@ static void attachExceptionHandler() {
static void postCachedMessages() {
if (RaygunNetworkUtils.hasInternetConnection(RaygunClient.getApplicationContext())) {
File[] fileList =
RaygunClient.getApplicationContext()
.getCacheDir()
.listFiles(new RaygunFileFilter());
RaygunClient.getApplicationContext()
.getCacheDir()
.listFiles(new RaygunFileFilter());
if (fileList != null) {
for (File f : fileList) {
try {
if (RaygunFileUtils.getExtension(f.getName())
.equalsIgnoreCase(RaygunSettings.DEFAULT_FILE_EXTENSION)) {
.equalsIgnoreCase(RaygunSettings.DEFAULT_FILE_EXTENSION)) {
ObjectInputStream ois = null;
try {
ois = new ObjectInputStream(new FileInputStream(f));
SerializedMessage serializedMessage =
(SerializedMessage) ois.readObject();
(SerializedMessage) ois.readObject();
enqueueWorkForCrashReportingService(
RaygunClient.getApiKey(), serializedMessage.message);
RaygunClient.getApiKey(), serializedMessage.message);
if (!f.delete()) {
RaygunLogger.w(
"Couldn't delete cached report (" + f.getName() + ")");
"Couldn't delete cached report (" + f.getName() + ")");
}
} finally {
if (ois != null) {
Expand All @@ -212,33 +214,33 @@ static void postCachedMessages() {
}
} catch (FileNotFoundException e) {
RaygunLogger.e(
"Error loading cached message from filesystem - " + e.getMessage());
"Error loading cached message from filesystem - " + e.getMessage());
} catch (IOException e) {
RaygunLogger.e(
"Error reading cached message from filesystem - " + e.getMessage());
"Error reading cached message from filesystem - " + e.getMessage());
} catch (ClassNotFoundException e) {
RaygunLogger.e(
"Error in handling cached message from filesystem - "
+ e.getMessage());
"Error in handling cached message from filesystem - "
+ e.getMessage());
}
}
} else {
RaygunLogger.e(
"Error in handling cached message from filesystem - could not get a list of"
+ " files from cache dir");
"Error in handling cached message from filesystem - could not get a list of"
+ " files from cache dir");
}
}
}

private static void enqueueWorkForCrashReportingService(String apiKey, String jsonPayload) {
Intent intent =
new Intent(RaygunClient.getApplicationContext(), CrashReportingPostService.class);
new Intent(RaygunClient.getApplicationContext(), CrashReportingPostService.class);
intent.setAction(
"com.raygun.raygun4android.intent.action.LAUNCH_CRASHREPORTING_POST_SERVICE");
"com.raygun.raygun4android.intent.action.LAUNCH_CRASHREPORTING_POST_SERVICE");
intent.setPackage("com.raygun.raygun4android");
intent.setComponent(
new ComponentName(
RaygunClient.getApplicationContext(), CrashReportingPostService.class));
new ComponentName(
RaygunClient.getApplicationContext(), CrashReportingPostService.class));

intent.putExtra("msg", jsonPayload);
intent.putExtra("apikey", apiKey);
Expand Down
2 changes: 2 additions & 0 deletions provider/src/main/java/com/raygun/raygun4android/IRaygunMessageBuilder.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.raygun.raygun4android;

import android.content.Context;

import com.raygun.raygun4android.messages.crashreporting.RaygunBreadcrumbMessage;
import com.raygun.raygun4android.messages.crashreporting.RaygunMessage;

import java.util.List;
import java.util.Map;

Expand Down
Loading

0 comments on commit d690e7e

Please sign in to comment.