From 972d1d399d486331de40fb7f0fc93666dbd22db0 Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Mon, 20 Feb 2023 10:33:02 +0600 Subject: [PATCH 1/2] 4339-Set_log_level_for_release_build issue: https://gitlab.e.foundation/e/backlog/-/issues/4339 `co.trikita.Log` supports custom logLevel settings, which is missing standard `android.util.Log`. If any dependent app uses this 3rd party library, they can also set the log level of our lib, so it can stop from printing sofisticated info into logcat. --- lib/build.gradle | 2 ++ .../main/java/com/nextcloud/android/sso/AccountImporter.java | 2 +- .../nextcloud/android/sso/aidl/ParcelFileDescriptorUtil.java | 2 +- .../java/com/nextcloud/android/sso/api/AidlNetworkRequest.java | 2 +- .../main/java/com/nextcloud/android/sso/api/NetworkRequest.java | 2 +- .../main/java/com/nextcloud/android/sso/api/NextcloudAPI.java | 2 +- .../android/sso/api/NextcloudRetrofitServiceMethod.java | 2 +- .../java/com/nextcloud/android/sso/exceptions/SSOException.java | 2 +- .../com/nextcloud/android/sso/helper/ExponentialBackoff.java | 2 +- .../java/com/nextcloud/android/sso/helper/Okhttp3Helper.java | 2 +- .../com/nextcloud/android/sso/helper/VersionCheckHelper.java | 2 +- 11 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/build.gradle b/lib/build.gradle index bfa049e1..18b23b85 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -120,6 +120,8 @@ dependencies { implementation 'com.google.android.material:material:1.6.1' + implementation 'co.trikita:log:1.1.5' + compileOnly "org.projectlombok:lombok:1.18.26" annotationProcessor "org.projectlombok:lombok:1.18.24" diff --git a/lib/src/main/java/com/nextcloud/android/sso/AccountImporter.java b/lib/src/main/java/com/nextcloud/android/sso/AccountImporter.java index a58cd373..dc5248d1 100644 --- a/lib/src/main/java/com/nextcloud/android/sso/AccountImporter.java +++ b/lib/src/main/java/com/nextcloud/android/sso/AccountImporter.java @@ -38,7 +38,7 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; -import android.util.Log; +import trikita.log.Log; import android.widget.Toast; import androidx.core.app.ActivityCompat; diff --git a/lib/src/main/java/com/nextcloud/android/sso/aidl/ParcelFileDescriptorUtil.java b/lib/src/main/java/com/nextcloud/android/sso/aidl/ParcelFileDescriptorUtil.java index 746219b8..05dffcf0 100644 --- a/lib/src/main/java/com/nextcloud/android/sso/aidl/ParcelFileDescriptorUtil.java +++ b/lib/src/main/java/com/nextcloud/android/sso/aidl/ParcelFileDescriptorUtil.java @@ -1,7 +1,7 @@ package com.nextcloud.android.sso.aidl; import android.os.ParcelFileDescriptor; -import android.util.Log; +import trikita.log.Log; import java.io.IOException; import java.io.InputStream; diff --git a/lib/src/main/java/com/nextcloud/android/sso/api/AidlNetworkRequest.java b/lib/src/main/java/com/nextcloud/android/sso/api/AidlNetworkRequest.java index 3f30b75b..67b8a9b8 100644 --- a/lib/src/main/java/com/nextcloud/android/sso/api/AidlNetworkRequest.java +++ b/lib/src/main/java/com/nextcloud/android/sso/api/AidlNetworkRequest.java @@ -31,7 +31,7 @@ import android.os.Looper; import android.os.NetworkOnMainThreadException; import android.os.ParcelFileDescriptor; import android.os.RemoteException; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/lib/src/main/java/com/nextcloud/android/sso/api/NetworkRequest.java b/lib/src/main/java/com/nextcloud/android/sso/api/NetworkRequest.java index 39d2a445..1eac226d 100644 --- a/lib/src/main/java/com/nextcloud/android/sso/api/NetworkRequest.java +++ b/lib/src/main/java/com/nextcloud/android/sso/api/NetworkRequest.java @@ -2,7 +2,7 @@ package com.nextcloud.android.sso.api; import android.content.Context; import android.os.Looper; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; diff --git a/lib/src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java b/lib/src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java index 3048e548..189b5dd3 100644 --- a/lib/src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java +++ b/lib/src/main/java/com/nextcloud/android/sso/api/NextcloudAPI.java @@ -24,7 +24,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import android.app.Activity; import android.content.Context; -import android.util.Log; +import trikita.log.Log; import com.google.gson.Gson; import com.nextcloud.android.sso.aidl.NextcloudRequest; diff --git a/lib/src/main/java/com/nextcloud/android/sso/api/NextcloudRetrofitServiceMethod.java b/lib/src/main/java/com/nextcloud/android/sso/api/NextcloudRetrofitServiceMethod.java index 83d4e717..0c132bb2 100644 --- a/lib/src/main/java/com/nextcloud/android/sso/api/NextcloudRetrofitServiceMethod.java +++ b/lib/src/main/java/com/nextcloud/android/sso/api/NextcloudRetrofitServiceMethod.java @@ -1,6 +1,6 @@ package com.nextcloud.android.sso.api; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/lib/src/main/java/com/nextcloud/android/sso/exceptions/SSOException.java b/lib/src/main/java/com/nextcloud/android/sso/exceptions/SSOException.java index cc9b6b1f..f48d6538 100644 --- a/lib/src/main/java/com/nextcloud/android/sso/exceptions/SSOException.java +++ b/lib/src/main/java/com/nextcloud/android/sso/exceptions/SSOException.java @@ -22,7 +22,7 @@ package com.nextcloud.android.sso.exceptions; import android.annotation.SuppressLint; import android.app.Application; import android.content.Context; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/lib/src/main/java/com/nextcloud/android/sso/helper/ExponentialBackoff.java b/lib/src/main/java/com/nextcloud/android/sso/helper/ExponentialBackoff.java index 8661cd55..5c6e3270 100644 --- a/lib/src/main/java/com/nextcloud/android/sso/helper/ExponentialBackoff.java +++ b/lib/src/main/java/com/nextcloud/android/sso/helper/ExponentialBackoff.java @@ -18,7 +18,7 @@ package com.nextcloud.android.sso.helper; import android.os.Handler; import android.os.Looper; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; diff --git a/lib/src/main/java/com/nextcloud/android/sso/helper/Okhttp3Helper.java b/lib/src/main/java/com/nextcloud/android/sso/helper/Okhttp3Helper.java index dfa9ba13..69047be3 100644 --- a/lib/src/main/java/com/nextcloud/android/sso/helper/Okhttp3Helper.java +++ b/lib/src/main/java/com/nextcloud/android/sso/helper/Okhttp3Helper.java @@ -1,6 +1,6 @@ package com.nextcloud.android.sso.helper; -import android.util.Log; +import trikita.log.Log; import com.nextcloud.android.sso.aidl.NextcloudRequest; import com.nextcloud.android.sso.api.NextcloudAPI; diff --git a/lib/src/main/java/com/nextcloud/android/sso/helper/VersionCheckHelper.java b/lib/src/main/java/com/nextcloud/android/sso/helper/VersionCheckHelper.java index aecf8f72..4152f7e2 100644 --- a/lib/src/main/java/com/nextcloud/android/sso/helper/VersionCheckHelper.java +++ b/lib/src/main/java/com/nextcloud/android/sso/helper/VersionCheckHelper.java @@ -21,7 +21,7 @@ package com.nextcloud.android.sso.helper; import android.content.Context; import android.content.pm.PackageManager; -import android.util.Log; +import trikita.log.Log; import androidx.annotation.NonNull; -- GitLab From 5021914f16e24efe550927b6a232543f0d9fe6ba Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Mon, 20 Feb 2023 15:15:57 +0600 Subject: [PATCH 2/2] Bump the version to 1.0.3-alpha --- lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index 18b23b85..cb2b1577 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -18,7 +18,7 @@ group = 'foundation.e.lib' def versionMajor = 1 def versionMinor = 0 -def versionPatch = 2 +def versionPatch = 3 def releasePatch = "alpha" def libName = "Android-SingleSignOn" -- GitLab