From f76cd885f175aa0e5825c1696ea759dec032257e Mon Sep 17 00:00:00 2001 From: "vincent.bourgmayer" Date: Wed, 8 Jul 2020 15:28:35 +0200 Subject: [PATCH 01/14] define userAgent --- .idea/jarRepositories.xml | 40 +++++++++++++++++++ .../e/drive/utils/AppConstants.java | 2 + .../foundation/e/drive/utils/CommonUtils.java | 6 +++ 3 files changed, 48 insertions(+) create mode 100644 .idea/jarRepositories.xml diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..1f83832 --- /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 2b9f36a..ec1f374 100644 --- a/app/src/main/java/foundation/e/drive/utils/AppConstants.java +++ b/app/src/main/java/foundation/e/drive/utils/AppConstants.java @@ -33,4 +33,6 @@ public abstract class AppConstants { public final static String notificationChannelID ="3310"; public final static String notificationChannelName="eDrive channel"; + public final static String USER_AGENT = "eos("+ Build.VERSION.RELEASE+"-"+Build.VERSION.INCREMENTAL+")-eDrive("+ BuildConfig.VERSION_CODE +")"; + } 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 398a16e..6c33675 100644 --- a/app/src/main/java/foundation/e/drive/utils/CommonUtils.java +++ b/app/src/main/java/foundation/e/drive/utils/CommonUtils.java @@ -131,6 +131,11 @@ public abstract class CommonUtils { serverUri = Uri.parse(AccountUtils.getBaseUrlForAccount(context, account)); oc = OwnCloudClientFactory.createOwnCloudClient(serverUri, context, true); oc.setCredentials(new OwnCloudBasicCredentials(account.name, AccountManager.get(context).getPassword(account) ) ); + //the below lines should be done only once + if(OwnCloudClientManagerFactory.getUserAgent() != AppConstants.USER_AGENT) { + Log.d(TAG, "buildUserAgent(): " + AppConstants.USER_AGENT); + OwnCloudClientManagerFactory.setUserAgent(AppConstants.USER_AGENT); + } }catch (Exception e){ Log.e(TAG, "Can\'t parse serverPath to Uri : "+e.toString() ); @@ -140,6 +145,7 @@ public abstract class CommonUtils { } + /** methods relative to file **/ /** -- GitLab From 1d1adf164de7dabc15e749e34909657050836c8c Mon Sep 17 00:00:00 2001 From: "vincent.bourgmayer" Date: Wed, 8 Jul 2020 15:44:22 +0200 Subject: [PATCH 02/14] fix test on UserAgent --- app/src/main/java/foundation/e/drive/utils/CommonUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6c33675..1e3a015 100644 --- a/app/src/main/java/foundation/e/drive/utils/CommonUtils.java +++ b/app/src/main/java/foundation/e/drive/utils/CommonUtils.java @@ -132,7 +132,7 @@ public abstract class CommonUtils { oc = OwnCloudClientFactory.createOwnCloudClient(serverUri, context, true); oc.setCredentials(new OwnCloudBasicCredentials(account.name, AccountManager.get(context).getPassword(account) ) ); //the below lines should be done only once - if(OwnCloudClientManagerFactory.getUserAgent() != AppConstants.USER_AGENT) { + if(!OwnCloudClientManagerFactory.getUserAgent().equals( AppConstants.USER_AGENT)) { Log.d(TAG, "buildUserAgent(): " + AppConstants.USER_AGENT); OwnCloudClientManagerFactory.setUserAgent(AppConstants.USER_AGENT); } -- GitLab From df6e7d107bb3c5408d37b0adcf386073a3c8fd70 Mon Sep 17 00:00:00 2001 From: "vincent.bourgmayer" Date: Wed, 8 Jul 2020 16:08:45 +0200 Subject: [PATCH 03/14] add missing import --- .../main/java/foundation/e/drive/utils/AppConstants.java | 7 +++++-- .../main/java/foundation/e/drive/utils/CommonUtils.java | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) 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 ec1f374..5ba5ea0 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,12 @@ * http://www.gnu.org/licenses/gpl.html */ - package foundation.e.drive.utils; +import android.os.Build; +import foundation.e.drive.BuildConfig; + /** * @author Vincent Bourgmayer */ @@ -33,6 +35,7 @@ public abstract class AppConstants { public final static String notificationChannelID ="3310"; public final static String notificationChannelName="eDrive channel"; - public final static String USER_AGENT = "eos("+ Build.VERSION.RELEASE+"-"+Build.VERSION.INCREMENTAL+")-eDrive("+ BuildConfig.VERSION_CODE +")"; + + public final static String USER_AGENT = "eos("+ Build.VERSION.RELEASE+"-"+Build.VERSION.INCREMENTAL+")-eDrive("+ BuildConfig.VERSION_NAME +")"; } 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 1e3a015..4b5342b 100644 --- a/app/src/main/java/foundation/e/drive/utils/CommonUtils.java +++ b/app/src/main/java/foundation/e/drive/utils/CommonUtils.java @@ -25,6 +25,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; import java.io.File; -- GitLab From b53609d750e1518d1ed4656e6a41260b33d462b1 Mon Sep 17 00:00:00 2001 From: "vincent.bourgmayer" Date: Wed, 8 Jul 2020 15:28:35 +0200 Subject: [PATCH 04/14] define userAgent --- .idea/gradle.xml | 22 ---------- .idea/jarRepositories.xml | 40 +++++++++++++++++++ .../e/drive/utils/AppConstants.java | 2 + .../foundation/e/drive/utils/CommonUtils.java | 6 +++ 4 files changed, 48 insertions(+), 22 deletions(-) delete mode 100644 .idea/gradle.xml create mode 100644 .idea/jarRepositories.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 746a801..0000000 --- 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 0000000..1f83832 --- /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 2b9f36a..ec1f374 100644 --- a/app/src/main/java/foundation/e/drive/utils/AppConstants.java +++ b/app/src/main/java/foundation/e/drive/utils/AppConstants.java @@ -33,4 +33,6 @@ public abstract class AppConstants { public final static String notificationChannelID ="3310"; public final static String notificationChannelName="eDrive channel"; + public final static String USER_AGENT = "eos("+ Build.VERSION.RELEASE+"-"+Build.VERSION.INCREMENTAL+")-eDrive("+ BuildConfig.VERSION_CODE +")"; + } 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 1cf1d02..f2b5976 100644 --- a/app/src/main/java/foundation/e/drive/utils/CommonUtils.java +++ b/app/src/main/java/foundation/e/drive/utils/CommonUtils.java @@ -158,6 +158,11 @@ public abstract class CommonUtils { serverUri = Uri.parse(AccountUtils.getBaseUrlForAccount(context, account)); oc = OwnCloudClientFactory.createOwnCloudClient(serverUri, context, true); oc.setCredentials(new OwnCloudBasicCredentials(account.name, AccountManager.get(context).getPassword(account))); + //the below lines should be done only once + if(OwnCloudClientManagerFactory.getUserAgent() != AppConstants.USER_AGENT) { + Log.d(TAG, "buildUserAgent(): " + AppConstants.USER_AGENT); + OwnCloudClientManagerFactory.setUserAgent(AppConstants.USER_AGENT); + } } catch (Exception e) { Log.e(TAG, "Can\'t parse serverPath to Uri : " + e.toString()); @@ -167,6 +172,7 @@ public abstract class CommonUtils { } + /** methods relative to file **/ /** -- GitLab From df448c70468520363f4774e7b84da8eaf200f5ed Mon Sep 17 00:00:00 2001 From: "vincent.bourgmayer" Date: Wed, 8 Jul 2020 15:44:22 +0200 Subject: [PATCH 05/14] fix test on UserAgent --- app/src/main/java/foundation/e/drive/utils/CommonUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f2b5976..d5b7907 100644 --- a/app/src/main/java/foundation/e/drive/utils/CommonUtils.java +++ b/app/src/main/java/foundation/e/drive/utils/CommonUtils.java @@ -159,7 +159,7 @@ public abstract class CommonUtils { oc = OwnCloudClientFactory.createOwnCloudClient(serverUri, context, true); oc.setCredentials(new OwnCloudBasicCredentials(account.name, AccountManager.get(context).getPassword(account))); //the below lines should be done only once - if(OwnCloudClientManagerFactory.getUserAgent() != AppConstants.USER_AGENT) { + if(!OwnCloudClientManagerFactory.getUserAgent().equals( AppConstants.USER_AGENT)) { Log.d(TAG, "buildUserAgent(): " + AppConstants.USER_AGENT); OwnCloudClientManagerFactory.setUserAgent(AppConstants.USER_AGENT); } -- GitLab From 53a269ce3b1aae15a3e7ced8e13eabd7d96164ab Mon Sep 17 00:00:00 2001 From: "vincent.bourgmayer" Date: Wed, 8 Jul 2020 16:08:45 +0200 Subject: [PATCH 06/14] add missing import --- .../main/java/foundation/e/drive/utils/AppConstants.java | 7 +++++-- .../main/java/foundation/e/drive/utils/CommonUtils.java | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) 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 ec1f374..5ba5ea0 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,12 @@ * http://www.gnu.org/licenses/gpl.html */ - package foundation.e.drive.utils; +import android.os.Build; +import foundation.e.drive.BuildConfig; + /** * @author Vincent Bourgmayer */ @@ -33,6 +35,7 @@ public abstract class AppConstants { public final static String notificationChannelID ="3310"; public final static String notificationChannelName="eDrive channel"; - public final static String USER_AGENT = "eos("+ Build.VERSION.RELEASE+"-"+Build.VERSION.INCREMENTAL+")-eDrive("+ BuildConfig.VERSION_CODE +")"; + + public final static String USER_AGENT = "eos("+ Build.VERSION.RELEASE+"-"+Build.VERSION.INCREMENTAL+")-eDrive("+ BuildConfig.VERSION_NAME +")"; } 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 d5b7907..475a04f 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; -- GitLab From 6e0cbf0a7ffc3083235b9464fc2ac59a860586d9 Mon Sep 17 00:00:00 2001 From: "vincent.bourgmayer" Date: Mon, 13 Jul 2020 16:37:58 +0200 Subject: [PATCH 07/14] port commit from nougat branch --- .../java/foundation/e/drive/utils/AppConstants.java | 13 ++++++++++++- .../java/foundation/e/drive/utils/CommonUtils.java | 5 ++--- 2 files changed, 14 insertions(+), 4 deletions(-) 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 5ba5ea0..519116d 100644 --- a/app/src/main/java/foundation/e/drive/utils/AppConstants.java +++ b/app/src/main/java/foundation/e/drive/utils/AppConstants.java @@ -36,6 +36,17 @@ public abstract class AppConstants { public final static String notificationChannelName="eDrive channel"; - public final static String USER_AGENT = "eos("+ Build.VERSION.RELEASE+"-"+Build.VERSION.INCREMENTAL+")-eDrive("+ BuildConfig.VERSION_NAME +")"; + 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 4fd43ba..2d1c16e 100644 --- a/app/src/main/java/foundation/e/drive/utils/CommonUtils.java +++ b/app/src/main/java/foundation/e/drive/utils/CommonUtils.java @@ -160,9 +160,8 @@ public abstract class CommonUtils { oc = OwnCloudClientFactory.createOwnCloudClient(serverUri, context, true); oc.setCredentials(new OwnCloudBasicCredentials(account.name, AccountManager.get(context).getPassword(account))); - //the below lines should be done only once - if(!OwnCloudClientManagerFactory.getUserAgent().equals( AppConstants.USER_AGENT)) { - Log.d(TAG, "buildUserAgent(): " + AppConstants.USER_AGENT); + Log.d(TAG, "user agent: "+AppConstants.USER_AGENT); + if(!AppConstants.USER_AGENT.equals(OwnCloudClientManagerFactory.getUserAgent())) { OwnCloudClientManagerFactory.setUserAgent(AppConstants.USER_AGENT); } -- GitLab From 2e62f40b12d9612076313ab9c3b0bfcea26442d6 Mon Sep 17 00:00:00 2001 From: "vincent.bourgmayer" Date: Mon, 13 Jul 2020 16:43:50 +0200 Subject: [PATCH 08/14] add missing import in AppConstants --- .../main/java/foundation/e/drive/utils/AppConstants.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 519116d..0cbc922 100644 --- a/app/src/main/java/foundation/e/drive/utils/AppConstants.java +++ b/app/src/main/java/foundation/e/drive/utils/AppConstants.java @@ -12,6 +12,14 @@ package foundation.e.drive.utils; import android.os.Build; import foundation.e.drive.BuildConfig; +import android.os.Build; + +import java.text.SimpleDateFormat; +import java.util.Locale; + +import foundation.e.drive.BuildConfig; + + /** * @author Vincent Bourgmayer */ -- GitLab From 92b9cea1c9f58bc9416c88cafb496fec2aabd6f0 Mon Sep 17 00:00:00 2001 From: "vincent.bourgmayer" Date: Mon, 13 Jul 2020 17:06:38 +0200 Subject: [PATCH 09/14] remove doublon --- app/src/main/java/foundation/e/drive/utils/AppConstants.java | 2 -- 1 file changed, 2 deletions(-) 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 0cbc922..1e18042 100644 --- a/app/src/main/java/foundation/e/drive/utils/AppConstants.java +++ b/app/src/main/java/foundation/e/drive/utils/AppConstants.java @@ -12,8 +12,6 @@ package foundation.e.drive.utils; import android.os.Build; import foundation.e.drive.BuildConfig; -import android.os.Build; - import java.text.SimpleDateFormat; import java.util.Locale; -- GitLab From 0f4622eef981b71d94ad5636b54392fcc821ebe8 Mon Sep 17 00:00:00 2001 From: "vincent.bourgmayer" Date: Mon, 13 Jul 2020 18:43:29 +0200 Subject: [PATCH 10/14] try update of nextcloud android lib for userAgent --- nextcloud-android-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud-android-lib b/nextcloud-android-lib index c6b717a..880099c 160000 --- a/nextcloud-android-lib +++ b/nextcloud-android-lib @@ -1 +1 @@ -Subproject commit c6b717a01c2f84015357cd9dfa8b48155ff01045 +Subproject commit 880099c889253f30969b81c5e07750f070bfb65c -- GitLab From 291e6a85298449e77fa87b8a5da08bfdba74255a Mon Sep 17 00:00:00 2001 From: "vincent.bourgmayer" Date: Thu, 16 Jul 2020 15:02:41 +0200 Subject: [PATCH 11/14] copy setUserAgent into DavClientProvider --- .../java/foundation/e/drive/utils/DavClientProvider.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/foundation/e/drive/utils/DavClientProvider.java b/app/src/main/java/foundation/e/drive/utils/DavClientProvider.java index 9686e97..ca798ba 100644 --- a/app/src/main/java/foundation/e/drive/utils/DavClientProvider.java +++ b/app/src/main/java/foundation/e/drive/utils/DavClientProvider.java @@ -24,6 +24,12 @@ public class DavClientProvider { if(clientInstance == null){ this.clientInstance = CommonUtils.getOwnCloudClient(account, ctx); } + + Log.d(DavClientProvider.class.getSimpleName(), "user agent: "+AppConstants.USER_AGENT); + if(!AppConstants.USER_AGENT.equals(OwnCloudClientManagerFactory.getUserAgent())) { + OwnCloudClientManagerFactory.setUserAgent(AppConstants.USER_AGENT); + } + return clientInstance; } -- GitLab From 0441fc1061531f514810590570ddf018571ad89d Mon Sep 17 00:00:00 2001 From: "vincent.bourgmayer" Date: Thu, 16 Jul 2020 15:06:06 +0200 Subject: [PATCH 12/14] add missing import log & owncloudclientmanagerfactory --- .../main/java/foundation/e/drive/utils/DavClientProvider.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/foundation/e/drive/utils/DavClientProvider.java b/app/src/main/java/foundation/e/drive/utils/DavClientProvider.java index ca798ba..b0d74cb 100644 --- a/app/src/main/java/foundation/e/drive/utils/DavClientProvider.java +++ b/app/src/main/java/foundation/e/drive/utils/DavClientProvider.java @@ -11,8 +11,10 @@ package foundation.e.drive.utils; import android.accounts.Account; import android.content.Context; +import android.util.Log; import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.OwnCloudClientManagerFactory; public class DavClientProvider { -- GitLab From a79115fc4d81662f1b2a6e63d766ed52513a3b34 Mon Sep 17 00:00:00 2001 From: Vincent Bourgmayer Date: Mon, 20 Jul 2020 09:22:39 +0000 Subject: [PATCH 13/14] Revert "add missing import log & owncloudclientmanagerfactory" This reverts commit 0441fc1061531f514810590570ddf018571ad89d --- .../main/java/foundation/e/drive/utils/DavClientProvider.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/java/foundation/e/drive/utils/DavClientProvider.java b/app/src/main/java/foundation/e/drive/utils/DavClientProvider.java index b0d74cb..ca798ba 100644 --- a/app/src/main/java/foundation/e/drive/utils/DavClientProvider.java +++ b/app/src/main/java/foundation/e/drive/utils/DavClientProvider.java @@ -11,10 +11,8 @@ package foundation.e.drive.utils; import android.accounts.Account; import android.content.Context; -import android.util.Log; import com.owncloud.android.lib.common.OwnCloudClient; -import com.owncloud.android.lib.common.OwnCloudClientManagerFactory; public class DavClientProvider { -- GitLab From c40f370f72109f690a312282b05c58553dc3d964 Mon Sep 17 00:00:00 2001 From: Vincent Bourgmayer Date: Mon, 20 Jul 2020 09:25:21 +0000 Subject: [PATCH 14/14] Revert "copy setUserAgent into DavClientProvider" This reverts commit 291e6a85298449e77fa87b8a5da08bfdba74255a --- .../java/foundation/e/drive/utils/DavClientProvider.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/src/main/java/foundation/e/drive/utils/DavClientProvider.java b/app/src/main/java/foundation/e/drive/utils/DavClientProvider.java index ca798ba..9686e97 100644 --- a/app/src/main/java/foundation/e/drive/utils/DavClientProvider.java +++ b/app/src/main/java/foundation/e/drive/utils/DavClientProvider.java @@ -24,12 +24,6 @@ public class DavClientProvider { if(clientInstance == null){ this.clientInstance = CommonUtils.getOwnCloudClient(account, ctx); } - - Log.d(DavClientProvider.class.getSimpleName(), "user agent: "+AppConstants.USER_AGENT); - if(!AppConstants.USER_AGENT.equals(OwnCloudClientManagerFactory.getUserAgent())) { - OwnCloudClientManagerFactory.setUserAgent(AppConstants.USER_AGENT); - } - return clientInstance; } -- GitLab