only show Google Drive option if device has PlayServices available

This commit is contained in:
Philipp Crocoll
2020-06-29 12:02:45 +02:00
parent f83e5dcc6e
commit 862083c0be

View File

@@ -46,6 +46,7 @@ using KeePassLib.Interfaces;
using KeePassLib.Utility; using KeePassLib.Utility;
#if !NoNet #if !NoNet
#if !EXCLUDE_JAVAFILESTORAGE #if !EXCLUDE_JAVAFILESTORAGE
using Android.Gms.Common;
using Keepass2android.Javafilestorage; using Keepass2android.Javafilestorage;
using GoogleDriveFileStorage = keepass2android.Io.GoogleDriveFileStorage; using GoogleDriveFileStorage = keepass2android.Io.GoogleDriveFileStorage;
using PCloudFileStorage = keepass2android.Io.PCloudFileStorage; using PCloudFileStorage = keepass2android.Io.PCloudFileStorage;
@@ -702,7 +703,7 @@ namespace keepass2android
#if !NoNet #if !NoNet
new DropboxFileStorage(Application.Context, this), new DropboxFileStorage(Application.Context, this),
new DropboxAppFolderFileStorage(Application.Context, this), new DropboxAppFolderFileStorage(Application.Context, this),
new GoogleDriveFileStorage(Application.Context, this), GoogleApiAvailability.Instance.IsGooglePlayServicesAvailable(Application.Context)==ConnectionResult.Success ? new GoogleDriveFileStorage(Application.Context, this) : null,
new OneDriveFileStorage(Application.Context, this), new OneDriveFileStorage(Application.Context, this),
new OneDrive2FullFileStorage(), new OneDrive2FullFileStorage(),
new OneDrive2MyFilesFileStorage(), new OneDrive2MyFilesFileStorage(),
@@ -716,7 +717,7 @@ namespace keepass2android
#endif #endif
#endif #endif
new LocalFileStorage(this) new LocalFileStorage(this)
}; }.Where(fs => fs != null).ToList();
} }
return _fileStorages; return _fileStorages;
} }