diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 746a8013b6b0721699966bcc7eb17c25fd0f68c1..0000000000000000000000000000000000000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000000000000000000000000000000000000..1f8383260e3f109391ac21306ab15d7c68f5529d --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/foundation/e/drive/utils/AppConstants.java b/app/src/main/java/foundation/e/drive/utils/AppConstants.java index 2b9f36a3bf0551b574861c5a4fa97814130746c0..1e180424b8cb05744a5e37cb6f1d72a6f92d46a6 100644 --- a/app/src/main/java/foundation/e/drive/utils/AppConstants.java +++ b/app/src/main/java/foundation/e/drive/utils/AppConstants.java @@ -6,10 +6,18 @@ * http://www.gnu.org/licenses/gpl.html */ - package foundation.e.drive.utils; +import android.os.Build; +import foundation.e.drive.BuildConfig; + +import java.text.SimpleDateFormat; +import java.util.Locale; + +import foundation.e.drive.BuildConfig; + + /** * @author Vincent Bourgmayer */ @@ -33,4 +41,18 @@ public abstract class AppConstants { public final static String notificationChannelID ="3310"; public final static String notificationChannelName="eDrive channel"; + + public final static String USER_AGENT = "eos("+getBuildTime()+")-eDrive("+ BuildConfig.VERSION_NAME +")"; + + /** + * Get a readable OS's build date String + * @return Os'build date + */ + private static String getBuildTime(){ + long ts = Build.TIME; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd", Locale.getDefault()); + return sdf.format(ts); + } + + } diff --git a/app/src/main/java/foundation/e/drive/utils/CommonUtils.java b/app/src/main/java/foundation/e/drive/utils/CommonUtils.java index 1cf1d029c3f89cc6c1da6677210d801baebe9153..2d1c16e2075583f573ec17e3d5845d66938b3a93 100644 --- a/app/src/main/java/foundation/e/drive/utils/CommonUtils.java +++ b/app/src/main/java/foundation/e/drive/utils/CommonUtils.java @@ -26,6 +26,7 @@ import android.webkit.MimeTypeMap; import com.owncloud.android.lib.common.OwnCloudBasicCredentials; import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.OwnCloudClientFactory; +import com.owncloud.android.lib.common.OwnCloudClientManagerFactory; import com.owncloud.android.lib.common.accounts.AccountUtils; import com.owncloud.android.lib.resources.files.FileUtils; @@ -159,6 +160,11 @@ public abstract class CommonUtils { oc = OwnCloudClientFactory.createOwnCloudClient(serverUri, context, true); oc.setCredentials(new OwnCloudBasicCredentials(account.name, AccountManager.get(context).getPassword(account))); + Log.d(TAG, "user agent: "+AppConstants.USER_AGENT); + if(!AppConstants.USER_AGENT.equals(OwnCloudClientManagerFactory.getUserAgent())) { + OwnCloudClientManagerFactory.setUserAgent(AppConstants.USER_AGENT); + } + } catch (Exception e) { Log.e(TAG, "Can\'t parse serverPath to Uri : " + e.toString()); oc = null; @@ -167,6 +173,7 @@ public abstract class CommonUtils { } + /** methods relative to file **/ /** diff --git a/nextcloud-android-lib b/nextcloud-android-lib index c6b717a01c2f84015357cd9dfa8b48155ff01045..880099c889253f30969b81c5e07750f070bfb65c 160000 --- a/nextcloud-android-lib +++ b/nextcloud-android-lib @@ -1 +1 @@ -Subproject commit c6b717a01c2f84015357cd9dfa8b48155ff01045 +Subproject commit 880099c889253f30969b81c5e07750f070bfb65c