From 2dd9bda27d05462c515eab2c9d2be1c4de7232f8 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sat, 20 Jun 2020 01:20:32 -0400 Subject: [PATCH] Replace local Base16Encoder with library --- app/build.gradle | 1 + .../openjpa/lib/util/Base16Encoder.java | 65 ------------------- 2 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 app/src/main/java/org/apache/openjpa/lib/util/Base16Encoder.java diff --git a/app/build.gradle b/app/build.gradle index dffc9a97..fb08995f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -90,6 +90,7 @@ dependencies { implementation 'com.getbase:floatingactionbutton:1.10.1' implementation 'com.nispok:snackbar:2.11.0' implementation 'com.github.aegnor:rencode-java:cb628e824e' + implementation 'org.apache.openjpa:openjpa-lib:3.1.1' implementation('com.github.afollestad.material-dialogs:core:0.9.6.0@aar') { transitive = true } diff --git a/app/src/main/java/org/apache/openjpa/lib/util/Base16Encoder.java b/app/src/main/java/org/apache/openjpa/lib/util/Base16Encoder.java deleted file mode 100644 index 51c301b1..00000000 --- a/app/src/main/java/org/apache/openjpa/lib/util/Base16Encoder.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openjpa.lib.util; - -/** - * Base 16 encoder. - * - * @author Marc Prud'hommeaux - * @nojavadoc - */ -public class Base16Encoder { - - private final static char[] HEX = new char[]{ - '0', '1', '2', '3', '4', '5', '6', '7', - '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; - - /** - * Convert bytes to a base16 string. - */ - public static String encode(byte[] byteArray) { - StringBuffer hexBuffer = new StringBuffer(byteArray.length * 2); - for (int i = 0; i < byteArray.length; i++) - for (int j = 1; j >= 0; j--) - hexBuffer.append(HEX[(byteArray[i] >> (j * 4)) & 0xF]); - return hexBuffer.toString(); - } - - /** - * Convert a base16 string into a byte array. - */ - public static byte[] decode(String s) { - int len = s.length(); - byte[] r = new byte[len / 2]; - for (int i = 0; i < r.length; i++) { - int digit1 = s.charAt(i * 2), digit2 = s.charAt(i * 2 + 1); - if (digit1 >= '0' && digit1 <= '9') - digit1 -= '0'; - else if (digit1 >= 'A' && digit1 <= 'F') - digit1 -= 'A' - 10; - if (digit2 >= '0' && digit2 <= '9') - digit2 -= '0'; - else if (digit2 >= 'A' && digit2 <= 'F') - digit2 -= 'A' - 10; - - r[i] = (byte) ((digit1 << 4) + digit2); - } - return r; - } -}