Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make ACRAConfiguration final #439

Merged
merged 5 commits into from
Apr 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/org/acra/collector/CrashReportDataFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;

import static org.acra.ACRA.LOG_TAG;
Expand Down Expand Up @@ -167,7 +167,7 @@ public String getCustomData(@NonNull String key) {
public CrashReportData createCrashData(@NonNull ReportBuilder builder) {
final CrashReportData crashReportData = new CrashReportData();
try {
final List<ReportField> crashReportFields = config.getReportFields();
final Set<ReportField> crashReportFields = config.getReportFields();

// Make every entry here bullet proof and move any slightly dodgy
// ones to the end.
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/org/acra/collector/DropBoxCollector.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.util.Calendar;
import java.util.List;
import java.util.Locale;
import java.util.Set;

import static org.acra.ACRA.LOG_TAG;

Expand Down Expand Up @@ -72,9 +73,9 @@ public String read(@NonNull Context context, @NonNull ACRAConfiguration config)
if (config.includeDropBoxSystemTags()) {
tags.addAll(Arrays.asList(SYSTEM_TAGS));
}
final String[] additionalTags = config.additionalDropBoxTags();
if (additionalTags.length > 0) {
tags.addAll(Arrays.asList(additionalTags));
final Set<String> additionalTags = config.additionalDropBoxTags();
if (additionalTags.size() > 0) {
tags.addAll(additionalTags);
}

if (tags.isEmpty()) {
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/org/acra/collector/LogCatCollector.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;

Expand Down Expand Up @@ -79,7 +78,7 @@ public String collectLogCat(@NonNull ACRAConfiguration config, @Nullable String
// "-t n" argument has been introduced in FroYo (API level 8). For
// devices with lower API level, we will have to emulate its job.
final int tailCount;
final List<String> logcatArgumentsList = new ArrayList<String>(Arrays.asList(config.logcatArguments()));
final List<String> logcatArgumentsList = new ArrayList<String>(config.logcatArguments());

final int tailIndex = logcatArgumentsList.indexOf("-t");
if (tailIndex > -1 && tailIndex < logcatArgumentsList.size()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ public String collect() {
sharedPrefs.put("default", PreferenceManager.getDefaultSharedPreferences(context));

// Add in any additional SharedPreferences
final String[] sharedPrefIds = config.additionalSharedPreferences();
for (final String sharedPrefId : sharedPrefIds) {
for (final String sharedPrefId : config.additionalSharedPreferences()) {
sharedPrefs.put(sharedPrefId, context.getSharedPreferences(sharedPrefId, Context.MODE_PRIVATE));
}

Expand Down
Loading