diff options
6 files changed, 31 insertions, 29 deletions
diff --git a/detekt.yaml b/detekt.yaml index 3470067..e15e45f 100644 --- a/detekt.yaml +++ b/detekt.yaml @@ -16,3 +16,5 @@ style: complexity: TooManyFunctions: active: false + NestedBlockDepth: + active: false diff --git a/libs/documents/src/main/java/org/the_jk/cleversync/io/documents/DelayedCreationDocumentFile.kt b/libs/documents/src/main/java/org/the_jk/cleversync/io/documents/DelayedCreationDocumentFile.kt index 9fdfb91..50d5918 100644 --- a/libs/documents/src/main/java/org/the_jk/cleversync/io/documents/DelayedCreationDocumentFile.kt +++ b/libs/documents/src/main/java/org/the_jk/cleversync/io/documents/DelayedCreationDocumentFile.kt @@ -6,7 +6,7 @@ import java.io.InputStream import java.io.OutputStream import java.time.Instant -internal class DelayedCreationDocumentFile constructor( +internal class DelayedCreationDocumentFile( private val metadata: DocumentMetadata, private val create: () -> DocumentFile ) : ModifiableFile { diff --git a/libs/documents/src/main/java/org/the_jk/cleversync/io/documents/DocumentDirectory.kt b/libs/documents/src/main/java/org/the_jk/cleversync/io/documents/DocumentDirectory.kt index e8b94aa..23ffad9 100644 --- a/libs/documents/src/main/java/org/the_jk/cleversync/io/documents/DocumentDirectory.kt +++ b/libs/documents/src/main/java/org/the_jk/cleversync/io/documents/DocumentDirectory.kt @@ -82,7 +82,7 @@ internal open class DocumentDirectory( override fun modifiableList(): ModifiableDirectory.Content { val list = contentResolver.getAllMetadata( DocumentsContract.buildChildDocumentsUriUsingTree(treeUri, metadata.documentId), - ) ?: throw IOException("Unable to list dir") + ) val dirs = mutableListOf<ModifiableDirectory>() val files = mutableListOf<ModifiableFile>() val links = mutableListOf<ModifiableLink>() @@ -281,7 +281,7 @@ internal open class DocumentDirectory( override fun equals(other: Any?) = other is DocumentDirectory && getRealTreeDocumentId(other.treeUri) == getRealTreeDocumentId(treeUri) override fun hashCode() = getRealTreeDocumentId(treeUri).hashCode() - override fun toString() = getRealTreeDocumentId(treeUri) ?: "null" + override fun toString() = getRealTreeDocumentId(treeUri) private fun findChild(displayName: String): DocumentMetadata? { val queryArgs = Bundle() diff --git a/libs/samba/src/main/cpp/jni.hpp b/libs/samba/src/main/cpp/jni.hpp index aa79bbe..55b7752 100644 --- a/libs/samba/src/main/cpp/jni.hpp +++ b/libs/samba/src/main/cpp/jni.hpp @@ -24,7 +24,7 @@ template<class T> class Ref { public: constexpr Ref() : ptr_(nullptr) {} - constexpr Ref(std::nullptr_t) : ptr_(nullptr) {} + constexpr Ref(std::nullptr_t) : ptr_(nullptr) {} // NOLINT Ref(const Ref<T>&) = delete; [[nodiscard]] T get() const { return ptr_; } @@ -62,7 +62,7 @@ template<class T> class LocalRef : public Ref<T> { public: constexpr LocalRef(): Ref<T>() {} - constexpr LocalRef(std::nullptr_t): Ref<T>() {} + constexpr LocalRef(std::nullptr_t): Ref<T>() {} // NOLINT LocalRef(JNIEnv* env, T ptr): Ref<T>(env, ptr) {} ~LocalRef() override { free(); } @@ -109,7 +109,7 @@ template<class T> class GlobalRef : public Ref<T> { public: constexpr GlobalRef() : Ref<T>() {} - constexpr GlobalRef(std::nullptr_t) : Ref<T>() {} + constexpr GlobalRef(std::nullptr_t) : Ref<T>() {} // NOLINT GlobalRef(JNIEnv* env, T ptr) : Ref<T>() { if (ptr) { if (!env) @@ -117,7 +117,7 @@ class GlobalRef : public Ref<T> { this->ptr_ = static_cast<T>(env->NewGlobalRef(static_cast<jobject>(ptr))); } } - GlobalRef(const Ref<T>& other) : Ref<T>() { + GlobalRef(const Ref<T>& other) : Ref<T>() { // NOLINT if (other) { auto* env = AttachCurrentThread(); this->ptr_ = static_cast<T>(env->NewGlobalRef(static_cast<jobject>(other.get()))); diff --git a/libs/samba/src/main/cpp/samba.cpp b/libs/samba/src/main/cpp/samba.cpp index 38ad5da..1632a05 100644 --- a/libs/samba/src/main/cpp/samba.cpp +++ b/libs/samba/src/main/cpp/samba.cpp @@ -219,19 +219,19 @@ class Context { std::shared_ptr<smb2_context> context_; }; -jlong nativeContextNew(JNIEnv* env, jclass clazz, jint timeout) { +jlong nativeContextNew(JNIEnv*, jclass, jint timeout) { return reinterpret_cast<jlong>(new Context(static_cast<int>(timeout))); } -void nativeContextDestroy(JNIEnv* env, jclass clazz, jlong ptr) { +void nativeContextDestroy(JNIEnv*, jclass, jlong ptr) { delete reinterpret_cast<Context*>(ptr); } -jlong nativeContextParseUrl(JNIEnv* env, jclass clazz, jlong ptr, jstring url) { +jlong nativeContextParseUrl(JNIEnv* env, jclass, jlong ptr, jstring url) { return reinterpret_cast<jlong>(reinterpret_cast<Context*>(ptr)->ParseUrl(jni::StringToUTF8(env, jni::ParamRef(env, url))).release()); } -jboolean nativeContextConnect(JNIEnv* env, jclass clazz, jlong context_ptr, jlong url_ptr, jstring j_username, jstring j_password) { +jboolean nativeContextConnect(JNIEnv* env, jclass, jlong context_ptr, jlong url_ptr, jstring j_username, jstring j_password) { auto* url = reinterpret_cast<Url*>(url_ptr); if (!url) return JNI_FALSE; std::optional<std::string> username; @@ -241,58 +241,58 @@ jboolean nativeContextConnect(JNIEnv* env, jclass clazz, jlong context_ptr, jlon return reinterpret_cast<Context*>(context_ptr)->Connect(*url, username, password) ? JNI_TRUE : JNI_FALSE; } -jstring nativeContextGetError(JNIEnv* env, jclass clazz, jlong ptr) { +jstring nativeContextGetError(JNIEnv* env, jclass, jlong ptr) { return jni::UTF8ToString(env, std::string(reinterpret_cast<Context*>(ptr)->GetError())).release(); } -jlong nativeContextOpenDir(JNIEnv* env, jclass clazz, jlong ptr, jstring path) { +jlong nativeContextOpenDir(JNIEnv* env, jclass, jlong ptr, jstring path) { return reinterpret_cast<jlong>(reinterpret_cast<Context*>(ptr)->OpenDir(jni::StringToUTF8(env, jni::ParamRef<jstring>(env, path))).release()); } -jobject nativeContextEntry(JNIEnv* env, jclass clazz, jlong ptr, jstring path) { +jobject nativeContextEntry(JNIEnv* env, jclass, jlong ptr, jstring path) { return reinterpret_cast<Context*>(ptr)->Entry(env, jni::StringToUTF8(env, jni::ParamRef<jstring>(env, path))).release(); } -jboolean nativeContextMakeDir(JNIEnv* env, jclass clazz, jlong ptr, jstring path) { +jboolean nativeContextMakeDir(JNIEnv* env, jclass, jlong ptr, jstring path) { return reinterpret_cast<Context*>(ptr)->MakeDir(jni::StringToUTF8(env, jni::ParamRef<jstring>(env, path))) ? JNI_TRUE : JNI_FALSE; } -jboolean nativeContextRemoveDir(JNIEnv* env, jclass clazz, jlong ptr, jstring path) { +jboolean nativeContextRemoveDir(JNIEnv* env, jclass, jlong ptr, jstring path) { return reinterpret_cast<Context*>(ptr)->RemoveDir(jni::StringToUTF8(env, jni::ParamRef<jstring>(env, path))) ? JNI_TRUE : JNI_FALSE; } -jboolean nativeContextUnlink(JNIEnv* env, jclass clazz, jlong ptr, jstring path) { +jboolean nativeContextUnlink(JNIEnv* env, jclass, jlong ptr, jstring path) { return reinterpret_cast<Context*>(ptr)->Unlink(jni::StringToUTF8(env, jni::ParamRef<jstring>(env, path))) ? JNI_TRUE : JNI_FALSE; } -jlong nativeContextOpenFile(JNIEnv* env, jclass clazz, jlong ptr, jstring path, jint mode) { +jlong nativeContextOpenFile(JNIEnv* env, jclass, jlong ptr, jstring path, jint mode) { return reinterpret_cast<jlong>(reinterpret_cast<Context*>(ptr)->OpenFile(jni::StringToUTF8(env, jni::ParamRef<jstring>(env, path)), mode).release()); } -void nativeUrlDestroy(JNIEnv* env, jclass clazz, jlong ptr) { +void nativeUrlDestroy(JNIEnv*, jclass, jlong ptr) { delete reinterpret_cast<Url*>(ptr); } -jstring nativeUrlPath(JNIEnv* env, jclass clazz, jlong ptr) { +jstring nativeUrlPath(JNIEnv* env, jclass, jlong ptr) { auto* path = reinterpret_cast<Url*>(ptr)->path(); return jni::UTF8ToString(env, std::string(path ? path : "")).release(); } -void nativeDirDestroy(JNIEnv* env, jclass clazz, jlong ptr) { +void nativeDirDestroy(JNIEnv*, jclass, jlong ptr) { delete reinterpret_cast<Dir*>(ptr); } jni::GlobalRef<jclass> g_DirEntryClass(nullptr, nullptr); -jobjectArray nativeDirList(JNIEnv* env, jclass clazz, jlong ptr) { +jobjectArray nativeDirList(JNIEnv* env, jclass, jlong ptr) { return reinterpret_cast<Dir*>(ptr)->List(env, g_DirEntryClass).release(); } -void nativeFileDestroy(JNIEnv* env, jclass clazz, jlong ptr) { +void nativeFileDestroy(JNIEnv*, jclass, jlong ptr) { delete reinterpret_cast<File*>(ptr); } -jint nativeFileRead(JNIEnv* env, jclass clazz, jlong ptr, jbyteArray array, jint offset, jint length) { +jint nativeFileRead(JNIEnv* env, jclass, jlong ptr, jbyteArray array, jint offset, jint length) { jboolean is_copy = JNI_FALSE; bool critical = true; auto* data = reinterpret_cast<jbyte*>(env->GetPrimitiveArrayCritical(array, &is_copy)); @@ -310,7 +310,7 @@ jint nativeFileRead(JNIEnv* env, jclass clazz, jlong ptr, jbyteArray array, jint return ret; } -jint nativeFileWrite(JNIEnv* env, jclass clazz, jlong ptr, jbyteArray array, jint offset, jint length) { +jint nativeFileWrite(JNIEnv* env, jclass, jlong ptr, jbyteArray array, jint offset, jint length) { jboolean is_copy = JNI_FALSE; bool critical = true; auto* data = reinterpret_cast<jbyte*>(env->GetPrimitiveArrayCritical(array, &is_copy)); @@ -328,7 +328,7 @@ jint nativeFileWrite(JNIEnv* env, jclass clazz, jlong ptr, jbyteArray array, jin return ret; } -jlong nativeFileSeek(JNIEnv* env, jclass clazz, jlong ptr, jlong offset, jint whence) { +jlong nativeFileSeek(JNIEnv*, jclass, jlong ptr, jlong offset, jint whence) { return reinterpret_cast<File*>(ptr)->seek(offset, whence); } @@ -401,7 +401,7 @@ jni::LocalRef<jobject> CreateDirEntry(JNIEnv* env, const std::string& name, cons } // namespace -jint JNI_OnLoad(JavaVM *vm, void *reserved) { +jint JNI_OnLoad(JavaVM *vm, void *) { auto* env = jni::OnLoad(vm); RegisterSamba(env); @@ -409,7 +409,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) { return jni::JNI_VERSION; } -void JNI_OnUnload(JavaVM *vm, void *reserved) { +void JNI_OnUnload(JavaVM *, void *) { // Not called on Android (or in general), but if it where, this would be the place to unregister. UnregisterSamba(); } diff --git a/libs/samba/src/main/java/org/the_jk/cleversync/io/samba/NativeSamba.kt b/libs/samba/src/main/java/org/the_jk/cleversync/io/samba/NativeSamba.kt index 590fab8..c0f18a4 100644 --- a/libs/samba/src/main/java/org/the_jk/cleversync/io/samba/NativeSamba.kt +++ b/libs/samba/src/main/java/org/the_jk/cleversync/io/samba/NativeSamba.kt @@ -112,7 +112,7 @@ internal object NativeSamba { return nativeContextUnlink(ptr, path) } - override fun openFile(path: String, mode: NativeSamba.OpenMode): File? { + override fun openFile(path: String, mode: OpenMode): File? { val file = nativeContextOpenFile(ptr, path, mode.value) return if (file != 0L) NativeFile(path, file) else null } |