From a0a1df809331f4a58c5a9908139f8ad9739c3256 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 28 Jun 2014 15:37:59 +0000
Subject: [PATCH] Remove local copies of I2P Secure* utilities since we are now
on Java 6 (API 9).
---
.../java/net/i2p/util/SecureDirectory.java | 23 ---------
.../main/java/net/i2p/util/SecureFile.java | 23 ---------
.../net/i2p/util/SecureFileOutputStream.java | 51 -------------------
routerjars/build.xml | 3 --
4 files changed, 100 deletions(-)
delete mode 100644 app/src/main/java/net/i2p/util/SecureDirectory.java
delete mode 100644 app/src/main/java/net/i2p/util/SecureFile.java
delete mode 100644 app/src/main/java/net/i2p/util/SecureFileOutputStream.java
diff --git a/app/src/main/java/net/i2p/util/SecureDirectory.java b/app/src/main/java/net/i2p/util/SecureDirectory.java
deleted file mode 100644
index f4c1c929f..000000000
--- a/app/src/main/java/net/i2p/util/SecureDirectory.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package net.i2p.util;
-
-import java.io.File;
-
-/**
- * setXXX() not available until API level 9 (Platform Version 2.3)
- * @since 0.8.7
- */
-public class SecureDirectory extends File {
- private static final long serialVersionUID = 1L;
-
- public SecureDirectory(String pathname) {
- super(pathname);
- }
-
- public SecureDirectory(String parent, String child) {
- super(parent, child);
- }
-
- public SecureDirectory(File parent, String child) {
- super(parent, child);
- }
-}
diff --git a/app/src/main/java/net/i2p/util/SecureFile.java b/app/src/main/java/net/i2p/util/SecureFile.java
deleted file mode 100644
index 88cbf7e88..000000000
--- a/app/src/main/java/net/i2p/util/SecureFile.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package net.i2p.util;
-
-import java.io.File;
-
-/**
- * setXXX() not available until API level 9 (Platform Version 2.3)
- * @since 0.8.7
- */
-public class SecureFile extends SecureDirectory {
- private static final long serialVersionUID = 1L;
-
- public SecureFile(String pathname) {
- super(pathname);
- }
-
- public SecureFile(String parent, String child) {
- super(parent, child);
- }
-
- public SecureFile(File parent, String child) {
- super(parent, child);
- }
-}
diff --git a/app/src/main/java/net/i2p/util/SecureFileOutputStream.java b/app/src/main/java/net/i2p/util/SecureFileOutputStream.java
deleted file mode 100644
index 899f7ab6a..000000000
--- a/app/src/main/java/net/i2p/util/SecureFileOutputStream.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package net.i2p.util;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-
-/**
- * setXXX() not available until API level 9 (Platform Version 2.3)
- * @since 0.8.7
- */
-public class SecureFileOutputStream extends FileOutputStream {
-
- /**
- * super()
- */
- public SecureFileOutputStream(String file) throws FileNotFoundException {
- super(file);
- }
-
- /**
- * super()
- */
- public SecureFileOutputStream(String file, boolean append) throws FileNotFoundException {
- super(file, append);
- }
-
- /**
- * super()
- */
- public SecureFileOutputStream(File file) throws FileNotFoundException {
- super(file);
- }
-
- /**
- * super()
- */
- public SecureFileOutputStream(File file, boolean append) throws FileNotFoundException {
- super(file, append);
- }
-
- /** @return false */
- static boolean canSetPerms() {
- return false;
- }
-
- /**
- * noop
- */
- public static void setPerms(File f) {
- }
-}
diff --git a/routerjars/build.xml b/routerjars/build.xml
index ba737591a..c6faf534b 100644
--- a/routerjars/build.xml
+++ b/routerjars/build.xml
@@ -49,9 +49,6 @@
<jar destfile="${jar.libs.dir}/i2p.jar" >
<zipfileset src="${i2pbase}/build/i2p.jar" >
<exclude name="net/i2p/util/LogWriter.class" />
- <exclude name="net/i2p/util/SecureDirectory.class" />
- <exclude name="net/i2p/util/SecureFile.class" />
- <exclude name="net/i2p/util/SecureFileOutputStream.class" />
</zipfileset>
</jar>
--
GitLab