Changeset 41595ca for apps/addressbook

Timestamp:

Aug 31, 2013 3:35:57 PM (7 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

6812dc1

Parents:

d6c4e41

Message:

• Addressbook: Don't write to log file on Android (ticket #859)

Location:

apps/addressbook/java/src/net/i2p/addressbook

Files:

• AddressBook.java (modified) (1 diff)
• Daemon.java (modified) (3 diffs)

apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java

@@ -261 +261 @@
      * @param overwrite True to overwrite
      * @param log
-     *            The log to write messages about new addresses or conflicts to.
+     *            The log to write messages about new addresses or conflicts to. May be null.
      *
      * @throws IllegalStateException if this was created with the Subscription constructor.

apps/addressbook/java/src/net/i2p/addressbook/Daemon.java

@@ -38 +38 @@
 import net.i2p.data.Destination;
 import net.i2p.util.SecureDirectory;
+import net.i2p.util.SystemVersion;
 
 /**
@@ -169 +170 @@
                                     publishedNS = new SingleFileNamingService(I2PAppContext.getGlobalContext(), published.getAbsolutePath());
                                 success = publishedNS.putIfAbsent(key, dest);
-                                if (!success) {
+                                if (log != null && !success) {
                                     try {
                                         log.append("Save to published address book " + published.getCanonicalPath() + " failed for new key " + key);
@@ -258 +259 @@
                 etagsFile, lastModifiedFile, lastFetchedFile, delay, defaultSubs, settings
                 .get("proxy_host"), Integer.parseInt(settings.get("proxy_port")));
-        Log log = new Log(logFile);
+        Log log = SystemVersion.isAndroid() ? null : new Log(logFile);
 
         // If false, add hosts via naming service; if true, write hosts.txt file directly