Skip to content

feat: add Android 19 compatible FileDataStoreFactory implementation #1070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jun 30, 2020
Merged

feat: add Android 19 compatible FileDataStoreFactory implementation #1070

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0d4bc5c
ci: add a animal sniffer check configuration for Android API level 19
chingor13 Jun 26, 2020
a8537c9
build(deps): update animal-sniffer-maven-plugin version
chingor13 Jun 26, 2020
cdaf1ea
feat: add Android comptible FileDataStoreFactory implementation
chingor13 Jun 26, 2020
e90753a
ci: allow java.nio.file in google-http-client
chingor13 Jun 26, 2020
9e52cce
chore: fix lint
chingor13 Jun 26, 2020
ef67a51
build: put animal-sniffer-maven-plugin back to 1.17
chingor13 Jun 26, 2020
ac2e9d2
fix: remove reflection from file permission settings
chingor13 Jun 29, 2020
932e50a
chore: run formatter
chingor13 Jun 29, 2020
da13906
chore: remove docs mentioning Java 1.5
chingor13 Jun 29, 2020
a3868b0
fix: move member assignment after input validation
chingor13 Jun 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix: move member assignment after input validation
  • Loading branch information
@chingor13
chingor13 committed Jun 29, 2020
commit a3868b06001ec1219b8b551870e0b1cb11e9849e
2 changes: 1 addition & 1 deletion ...c/main/java/com/google/api/client/extensions/android/util/store/FileDataStoreFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ public class FileDataStoreFactory extends AbstractDataStoreFactory {
/** @param dataDirectory data directory */
public FileDataStoreFactory(File dataDirectory) throws IOException {
dataDirectory = dataDirectory.getCanonicalFile();
this.dataDirectory = dataDirectory;
// error if it is a symbolic link
if (IOUtils.isSymbolicLink(dataDirectory)) {
throw new IOException("unable to use a symbolic link: " + dataDirectory);
Expand All @@ -58,6 +57,7 @@ public FileDataStoreFactory(File dataDirectory) throws IOException {
if (!dataDirectory.exists() && !dataDirectory.mkdirs()) {
throw new IOException("unable to create directory: " + dataDirectory);
}
this.dataDirectory = dataDirectory;
setPermissionsToOwnerOnly(dataDirectory);
}

Expand Down
2 changes: 1 addition & 1 deletion google-http-client/src/main/java/com/google/api/client/util/store/FileDataStoreFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ public class FileDataStoreFactory extends AbstractDataStoreFactory {
/** @param dataDirectory data directory */
public FileDataStoreFactory(File dataDirectory) throws IOException {
dataDirectory = dataDirectory.getCanonicalFile();
this.dataDirectory = dataDirectory;
// error if it is a symbolic link
if (IOUtils.isSymbolicLink(dataDirectory)) {
throw new IOException("unable to use a symbolic link: " + dataDirectory);
Expand All @@ -75,6 +74,7 @@ public FileDataStoreFactory(File dataDirectory) throws IOException {
if (!dataDirectory.exists() && !dataDirectory.mkdirs()) {
throw new IOException("unable to create directory: " + dataDirectory);
}
this.dataDirectory = dataDirectory;

if (IS_WINDOWS) {
setPermissionsToOwnerOnlyWindows(dataDirectory);
Expand Down