Skip to content

Commit

Permalink
replace native with AndroidFramework
Browse files Browse the repository at this point in the history
  • Loading branch information
F43nd1r committed Apr 20, 2016
1 parent 97a3a24 commit 2f9f255
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/main/java/org/acra/ACRAConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private ACRAConstants(){}
*/
public static final String NULL_VALUE = "ACRA-NULL-STRING";

public static final boolean DEFAULT_REPORT_TO_NATIVE = false;
public static final boolean DEFAULT_REPORT_TO_ANDROID_FRAMEWORK = false;

public static final int DEFAULT_SOCKET_TIMEOUT = 8000;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/acra/annotation/ReportsCrashes.java
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@
*
* @return true if the force close dialog has to be displayed.
*/
boolean alsoReportToNative() default ACRAConstants.DEFAULT_REPORT_TO_NATIVE;
boolean alsoReportToAndroidFramework() default ACRAConstants.DEFAULT_REPORT_TO_ANDROID_FRAMEWORK;

/**
* Add here your {@link SharedPreferences} identifier Strings if you use
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/acra/builder/ReportExecutor.java
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ private void dialogAndEnd(@NonNull ReportBuilder reportBuilder, @NonNull File re
* End the application.
*/
private void endApplication(@Nullable Thread uncaughtExceptionThread, Throwable th) {
final boolean letDefaultHandlerEndApplication = config.alsoReportToNative();
final boolean letDefaultHandlerEndApplication = config.alsoReportToAndroidFramework();

final boolean handlingUncaughtException = uncaughtExceptionThread != null;
if (handlingUncaughtException && letDefaultHandlerEndApplication && (defaultExceptionHandler != null)) {
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/acra/config/ACRAConfiguration.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public final class ACRAConfiguration implements Serializable {
private boolean deleteUnapprovedReportsOnApplicationStart;
private boolean deleteOldUnsentReportsOnApplicationStart;
private int dropboxCollectionMinutes;
private boolean alsoReportToNative;
private boolean alsoReportToAndroidFramework;
private String formUri;
private String formUriBasicAuthLogin;
private String formUriBasicAuthPassword;
Expand Down Expand Up @@ -153,7 +153,7 @@ public final class ACRAConfiguration implements Serializable {
deleteUnapprovedReportsOnApplicationStart = builder.deleteUnapprovedReportsOnApplicationStart();
deleteOldUnsentReportsOnApplicationStart = builder.deleteOldUnsentReportsOnApplicationStart();
dropboxCollectionMinutes = builder.dropboxCollectionMinutes();
alsoReportToNative = builder.alsoReportToNative();
alsoReportToAndroidFramework = builder.alsoReportToAndroidFramework();
formUri = builder.formUri();
formUriBasicAuthLogin = builder.formUriBasicAuthLogin();
formUriBasicAuthPassword = builder.formUriBasicAuthPassword();
Expand Down Expand Up @@ -317,13 +317,13 @@ public ACRAConfiguration setDropboxCollectionMinutes(int dropboxCollectionMinute
}

/**
* @param forceCloseDialogAfterToast the alsoReportToNative to set
* @param forceCloseDialogAfterToast the alsoReportToAndroidFramework to set
* @return The updated ACRA configuration
* @deprecated since 4.8.1 - configure using {@link ConfigurationBuilder} instead. ACRAConfiguration will become immutable in the near future.
*/
@NonNull
public ACRAConfiguration setForceCloseDialogAfterToast(boolean forceCloseDialogAfterToast) {
this.alsoReportToNative = forceCloseDialogAfterToast;
this.alsoReportToAndroidFramework = forceCloseDialogAfterToast;
return this;
}

Expand Down Expand Up @@ -827,8 +827,8 @@ public int dropboxCollectionMinutes() {
return dropboxCollectionMinutes;
}

public boolean alsoReportToNative() {
return alsoReportToNative;
public boolean alsoReportToAndroidFramework() {
return alsoReportToAndroidFramework;
}

@Nullable
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/org/acra/config/ConfigurationBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public final class ConfigurationBuilder {
private Boolean deleteUnapprovedReportsOnApplicationStart;
private Boolean deleteOldUnsentReportsOnApplicationStart;
private Integer dropboxCollectionMinutes;
private Boolean alsoReportToNative;
private Boolean alsoReportToAndroidFramework;
private String formUri;
private String formUriBasicAuthLogin;
private String formUriBasicAuthPassword;
Expand Down Expand Up @@ -139,7 +139,7 @@ public ConfigurationBuilder(@NonNull Application app) {
deleteUnapprovedReportsOnApplicationStart = annotationConfig.deleteUnapprovedReportsOnApplicationStart();
deleteOldUnsentReportsOnApplicationStart = annotationConfig.deleteOldUnsentReportsOnApplicationStart();
dropboxCollectionMinutes = annotationConfig.dropboxCollectionMinutes();
alsoReportToNative = annotationConfig.alsoReportToNative();
alsoReportToAndroidFramework = annotationConfig.alsoReportToAndroidFramework();
formUri = annotationConfig.formUri();
formUriBasicAuthLogin = annotationConfig.formUriBasicAuthLogin();
formUriBasicAuthPassword = annotationConfig.formUriBasicAuthPassword();
Expand Down Expand Up @@ -291,12 +291,12 @@ public ConfigurationBuilder setDropboxCollectionMinutes(int dropboxCollectionMin
}

/**
* @param alsoReportToNative the alsoReportToNative to set
* @param alsoReportToAndroidFramework the alsoReportToAndroidFramework to set
* @return this instance
*/
@NonNull
public ConfigurationBuilder setAlsoReportToNative(boolean alsoReportToNative) {
this.alsoReportToNative = alsoReportToNative;
public ConfigurationBuilder setAlsoReportToAndroidFramework(boolean alsoReportToAndroidFramework) {
this.alsoReportToAndroidFramework = alsoReportToAndroidFramework;
return this;
}

Expand Down Expand Up @@ -839,11 +839,11 @@ int dropboxCollectionMinutes() {
return DEFAULT_DROPBOX_COLLECTION_MINUTES;
}

boolean alsoReportToNative() {
if (alsoReportToNative != null) {
return alsoReportToNative;
boolean alsoReportToAndroidFramework() {
if (alsoReportToAndroidFramework != null) {
return alsoReportToAndroidFramework;
}
return DEFAULT_REPORT_TO_NATIVE;
return DEFAULT_REPORT_TO_ANDROID_FRAMEWORK;
}

@NonNull
Expand Down

0 comments on commit 2f9f255

Please sign in to comment.