Skip to content

[stable-1.6] Defensive check for Log_OC arguments for null #341

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.

Sign up for GitHub

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

Merged
tobiasKaminsky merged 1 commit into from
Oct 2, 2019
Merged

[stable-1.6] Defensive check for Log_OC arguments for null #341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 42 additions & 24 deletions src/main/java/com/owncloud/android/lib/common/utils/Log_OC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,51 +42,69 @@ public interface Adapter {
static class LegacyImpl implements Adapter {

@Override
public void i(String tag, String message) {
Log.i(tag, message);
appendLog(tag + ": " + message);
public void i(final String tag, final String message) {
if (tag != null && message != null) {
Log.i(tag, message);
appendLog(tag + ": " + message);
}
}

@Override
public void d(String tag, String message) {
Log.d(tag, message);
appendLog(tag + ": " + message);
public void d(final String tag, final String message) {
if (tag != null && message != null) {
Log.d(tag, message);
appendLog(tag + ": " + message);
}
}

@Override
public void d(String tag, String message, Exception e) {
Log.d(tag, message, e);
appendLog(tag + ": " + message + " Exception: " + Arrays.toString(e.getStackTrace()));
public void d(final String tag, final String message, Exception e) {
if (tag != null && message != null && e != null) {
Log.d(tag, message, e);
StackTraceElement[] trace = e.getStackTrace();
appendLog(tag + ": " + message + " Exception: " + Arrays.toString(trace));
}
}

@Override
public void e(String tag, String message) {
Log.e(tag, message);
appendLog(tag + ": " + message);
public void e(final String tag, final String message) {
if (tag != null && message != null) {
Log.e(tag, message);
appendLog(tag + ": " + message);
}
}

@Override
public void e(String tag, String message, Throwable t) {
Log.e(tag, message, t);
appendLog(tag + ": " + message + " Exception: " + Arrays.toString(t.getStackTrace()));
public void e(final String tag, final String message, final Throwable t) {
if (tag != null && message != null && t != null) {
Log.e(tag, message, t);
StackTraceElement[] trace = t.getStackTrace();
appendLog(tag + ": " + message + " Exception: " + Arrays.toString(trace));
}
}

@Override
public void v(String tag, String message) {
Log.v(tag, message);
appendLog(tag + ": " + message);
public void v(final String tag, final String message) {
if (tag != null && message != null) {
Log.v(tag, message);
appendLog(tag + ": " + message);
}
}

@Override
public void w(String tag, String message) {
Log.w(tag, message);
appendLog(tag + ": " + message);
public void w(final String tag, final String message) {
if (tag != null && message != null) {
Log.w(tag, message);
appendLog(tag + ": " + message);
}
}

@Override
public void wtf(String tag, String message) {
Log.wtf(tag, message);
appendLog(tag + ": " + message);
public void wtf(final String tag, final String message) {
if (tag != null && message != null) {
Log.wtf(tag, message);
appendLog(tag + ": " + message);
}
}
}

Expand Down