diff options
author | cyberta <cyberta@riseup.net> | 2017-09-29 07:27:19 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2017-09-29 07:27:19 +0000 |
commit | fc913a46cfc85c0bdb0c9d19b2c94c8b53f93b1f (patch) | |
tree | 247408a15cd7caf621206d574af61d0c16d25876 /app/src/main/java/de/blinkt/openvpn/core/LogItem.java | |
parent | 51afe1eeba990c2cd57bd842a96f7a756df51ce8 (diff) | |
parent | 7322b8e01f852bb4d0243a6ff2fc563422ba274c (diff) |
Merge branch 'feature/updateDependencies' into 'master'
Feature/update dependencies
See merge request leap/bitmask_android!8
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/core/LogItem.java')
-rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/LogItem.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/core/LogItem.java b/app/src/main/java/de/blinkt/openvpn/core/LogItem.java index 6aefbb2e..cd048f4a 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/LogItem.java +++ b/app/src/main/java/de/blinkt/openvpn/core/LogItem.java @@ -12,12 +12,10 @@ import android.content.pm.PackageManager; import android.content.pm.Signature; import android.os.Parcel; import android.os.Parcelable; -import android.text.TextUtils; -import android.util.Log; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.UnsupportedEncodingException; +import java.nio.BufferOverflowException; import java.nio.ByteBuffer; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -89,7 +87,7 @@ public class LogItem implements Parcelable { } - public byte[] getMarschaledBytes() throws UnsupportedEncodingException { + public byte[] getMarschaledBytes() throws UnsupportedEncodingException, BufferOverflowException { ByteBuffer bb = ByteBuffer.allocate(16384); |