From 67fb18e1f1dd34f7ccfcedd78a7358437b4a8bce Mon Sep 17 00:00:00 2001 From: dkocher Date: Mon, 26 Oct 2015 12:37:35 +0000 Subject: [PATCH] Merge remote-tracking branch 'origin/master' git-svn-id: https://svn.cyberduck.io/trunk@18412 9e2dff1d-8f06-0410-b5b1-4d70b6340adc --- build.properties | 2 +- source/ch/cyberduck/core/aquaticprime/DonationKeyFactory.java | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build.properties b/build.properties index 5ab3c1f6c7..a880a5e0f5 100644 --- a/build.properties +++ b/build.properties @@ -18,5 +18,5 @@ # cyberduck.version.major=4 -cyberduck.version.minor=8 +cyberduck.version.minor=7.3 updater.version=2.6.18.4 diff --git a/source/ch/cyberduck/core/aquaticprime/DonationKeyFactory.java b/source/ch/cyberduck/core/aquaticprime/DonationKeyFactory.java index 4f944cf86c..cc3642e0cf 100644 --- a/source/ch/cyberduck/core/aquaticprime/DonationKeyFactory.java +++ b/source/ch/cyberduck/core/aquaticprime/DonationKeyFactory.java @@ -22,7 +22,6 @@ import ch.cyberduck.core.Filter; import ch.cyberduck.core.Local; import ch.cyberduck.core.LocalFactory; import ch.cyberduck.core.exception.AccessDeniedException; -import ch.cyberduck.core.preferences.Preferences; import ch.cyberduck.core.preferences.PreferencesFactory; import org.apache.commons.io.FilenameUtils; @@ -37,8 +36,6 @@ import java.util.List; public class DonationKeyFactory extends LicenseFactory { private static final Logger log = Logger.getLogger(DonationKeyFactory.class); - private Preferences preferences = PreferencesFactory.get(); - @Override protected License create() { return new DefaultLicenseFactory(this).create(); @@ -57,9 +54,7 @@ public class DonationKeyFactory extends LicenseFactory { log.info("No donation key found"); } // No key found. Look for receipt in sandboxed application container - for(Local file : LocalFactory.get(String.format("~/Library/Containers/%s/Data/Library/Application Support/%s", - preferences.getProperty("application.identifier"), - preferences.getProperty("application.name"))).list().filter(new Filter() { + for(Local file : LocalFactory.get(PreferencesFactory.get().getProperty("application.support.path")).list().filter(new Filter() { @Override public boolean accept(final Local file) { return "cyberduckreceipt".equals(FilenameUtils.getExtension(file.getName())); -- 2.11.4.GIT