Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit 9a1d95c

Browse files
msfjarvismsfjarvis
committed
crypto-common: fixup package names
1 parent 0cf037d commit 9a1d95c

File tree

8 files changed

+26
-27
lines changed

8 files changed

+26
-27
lines changed

Diff for: ‎app/src/main/java/dev/msfjarvis/aps/injection/crypto/CryptoHandlerModule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import dagger.hilt.InstallIn
1111
import dagger.hilt.components.SingletonComponent
1212
import dagger.multibindings.IntoSet
1313
import dev.msfjarvis.aps.crypto.PGPainlessCryptoHandler
14-
import dev.msfjarvis.aps.data.crypto.CryptoHandler
14+
import dev.msfjarvis.aps.crypto.CryptoHandler
1515

1616
/**
1717
* This module adds all [CryptoHandler] implementations into a Set which makes it easier to build

Diff for: ‎crypto-common/api/crypto-common.api

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
1-
public abstract class dev/msfjarvis/aps/data/crypto/CryptoException : java/lang/Exception {
1+
public abstract class dev/msfjarvis/aps/crypto/CryptoException : java/lang/Exception {
22
public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
33
public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
44
}
55

6-
public abstract interface class dev/msfjarvis/aps/data/crypto/CryptoHandler {
6+
public abstract interface class dev/msfjarvis/aps/crypto/CryptoHandler {
77
public abstract fun canHandle (Ljava/lang/String;)Z
88
public abstract fun decrypt (Ljava/lang/String;Ljava/lang/String;Ljava/io/InputStream;Ljava/io/OutputStream;)V
99
public abstract fun encrypt (Ljava/util/List;Ljava/io/InputStream;Ljava/io/OutputStream;)V
1010
}
1111

12-
public abstract interface class dev/msfjarvis/aps/data/crypto/KeyManager {
13-
public abstract fun addKey (Ldev/msfjarvis/aps/data/crypto/KeyPair;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
12+
public abstract interface class dev/msfjarvis/aps/crypto/KeyManager {
13+
public abstract fun addKey (Ldev/msfjarvis/aps/crypto/KeyPair;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
1414
public abstract fun canHandle (Ljava/lang/String;)Z
1515
public abstract fun getAllKeys (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
1616
public abstract fun getKeyById (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
17-
public abstract fun removeKey (Ldev/msfjarvis/aps/data/crypto/KeyPair;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
17+
public abstract fun removeKey (Ldev/msfjarvis/aps/crypto/KeyPair;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
1818
}
1919

20-
public final class dev/msfjarvis/aps/data/crypto/KeyManager$DefaultImpls {
21-
public static synthetic fun addKey$default (Ldev/msfjarvis/aps/data/crypto/KeyManager;Ldev/msfjarvis/aps/data/crypto/KeyPair;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
20+
public final class dev/msfjarvis/aps/crypto/KeyManager$DefaultImpls {
21+
public static synthetic fun addKey$default (Ldev/msfjarvis/aps/crypto/KeyManager;Ldev/msfjarvis/aps/crypto/KeyPair;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
2222
}
2323

24-
public abstract class dev/msfjarvis/aps/data/crypto/KeyManagerException : dev/msfjarvis/aps/data/crypto/CryptoException {
24+
public abstract class dev/msfjarvis/aps/crypto/KeyManagerException : dev/msfjarvis/aps/crypto/CryptoException {
2525
public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
2626
public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
2727
}
2828

29-
public final class dev/msfjarvis/aps/data/crypto/KeyManagerException$KeyAlreadyExistsException : dev/msfjarvis/aps/data/crypto/KeyManagerException {
29+
public final class dev/msfjarvis/aps/crypto/KeyManagerException$KeyAlreadyExistsException : dev/msfjarvis/aps/crypto/KeyManagerException {
3030
public fun <init> (Ljava/lang/String;)V
3131
}
3232

33-
public final class dev/msfjarvis/aps/data/crypto/KeyManagerException$KeyDeletionFailedException : dev/msfjarvis/aps/data/crypto/KeyManagerException {
34-
public static final field INSTANCE Ldev/msfjarvis/aps/data/crypto/KeyManagerException$KeyDeletionFailedException;
33+
public final class dev/msfjarvis/aps/crypto/KeyManagerException$KeyDeletionFailedException : dev/msfjarvis/aps/crypto/KeyManagerException {
34+
public static final field INSTANCE Ldev/msfjarvis/aps/crypto/KeyManagerException$KeyDeletionFailedException;
3535
}
3636

37-
public final class dev/msfjarvis/aps/data/crypto/KeyManagerException$KeyDirectoryUnavailableException : dev/msfjarvis/aps/data/crypto/KeyManagerException {
38-
public static final field INSTANCE Ldev/msfjarvis/aps/data/crypto/KeyManagerException$KeyDirectoryUnavailableException;
37+
public final class dev/msfjarvis/aps/crypto/KeyManagerException$KeyDirectoryUnavailableException : dev/msfjarvis/aps/crypto/KeyManagerException {
38+
public static final field INSTANCE Ldev/msfjarvis/aps/crypto/KeyManagerException$KeyDirectoryUnavailableException;
3939
}
4040

41-
public final class dev/msfjarvis/aps/data/crypto/KeyManagerException$KeyNotFoundException : dev/msfjarvis/aps/data/crypto/KeyManagerException {
41+
public final class dev/msfjarvis/aps/crypto/KeyManagerException$KeyNotFoundException : dev/msfjarvis/aps/crypto/KeyManagerException {
4242
public fun <init> (Ljava/lang/String;)V
4343
}
4444

45-
public final class dev/msfjarvis/aps/data/crypto/KeyManagerException$NoKeysAvailableException : dev/msfjarvis/aps/data/crypto/KeyManagerException {
46-
public static final field INSTANCE Ldev/msfjarvis/aps/data/crypto/KeyManagerException$NoKeysAvailableException;
45+
public final class dev/msfjarvis/aps/crypto/KeyManagerException$NoKeysAvailableException : dev/msfjarvis/aps/crypto/KeyManagerException {
46+
public static final field INSTANCE Ldev/msfjarvis/aps/crypto/KeyManagerException$NoKeysAvailableException;
4747
}
4848

49-
public abstract interface class dev/msfjarvis/aps/data/crypto/KeyPair {
49+
public abstract interface class dev/msfjarvis/aps/crypto/KeyPair {
5050
public abstract fun getKeyId ()Ljava/lang/String;
5151
public abstract fun getPrivateKey ()[B
5252
public abstract fun getPublicKey ()[B
5353
}
5454

55-
public abstract class dev/msfjarvis/aps/data/crypto/KeyPairException : dev/msfjarvis/aps/data/crypto/CryptoException {
55+
public abstract class dev/msfjarvis/aps/crypto/KeyPairException : dev/msfjarvis/aps/crypto/CryptoException {
5656
public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
5757
public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
5858
}
5959

60-
public final class dev/msfjarvis/aps/data/crypto/KeyPairException$PrivateKeyUnavailableException : dev/msfjarvis/aps/data/crypto/KeyPairException {
61-
public static final field INSTANCE Ldev/msfjarvis/aps/data/crypto/KeyPairException$PrivateKeyUnavailableException;
60+
public final class dev/msfjarvis/aps/crypto/KeyPairException$PrivateKeyUnavailableException : dev/msfjarvis/aps/crypto/KeyPairException {
61+
public static final field INSTANCE Ldev/msfjarvis/aps/crypto/KeyPairException$PrivateKeyUnavailableException;
6262
}
6363

Diff for: ‎crypto-common/src/main/kotlin/dev/msfjarvis/aps/data/crypto/CryptoException.kt renamed to ‎crypto-common/src/main/kotlin/dev/msfjarvis/aps/crypto/CryptoException.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.msfjarvis.aps.data.crypto
1+
package dev.msfjarvis.aps.crypto
22

33
public sealed class CryptoException(message: String? = null) : Exception(message)
44

Diff for: ‎crypto-common/src/main/kotlin/dev/msfjarvis/aps/data/crypto/CryptoHandler.kt renamed to ‎crypto-common/src/main/kotlin/dev/msfjarvis/aps/crypto/CryptoHandler.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: GPL-3.0-only
44
*/
55

6-
package dev.msfjarvis.aps.data.crypto
6+
package dev.msfjarvis.aps.crypto
77

88
import java.io.InputStream
99
import java.io.OutputStream

Diff for: ‎crypto-common/src/main/kotlin/dev/msfjarvis/aps/data/crypto/KeyManager.kt renamed to ‎crypto-common/src/main/kotlin/dev/msfjarvis/aps/crypto/KeyManager.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: GPL-3.0-only
44
*/
55

6-
package dev.msfjarvis.aps.data.crypto
6+
package dev.msfjarvis.aps.crypto
77

88
import com.github.michaelbull.result.Result
99

Diff for: ‎crypto-common/src/main/kotlin/dev/msfjarvis/aps/data/crypto/KeyPair.kt renamed to ‎crypto-common/src/main/kotlin/dev/msfjarvis/aps/crypto/KeyPair.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: GPL-3.0-only
44
*/
55

6-
package dev.msfjarvis.aps.data.crypto
6+
package dev.msfjarvis.aps.crypto
77

88
/** Defines expectations for a keypair used in public key cryptography. */
99
public interface KeyPair {

Diff for: ‎crypto-pgpainless/api/crypto-pgpainless.api

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
public final class dev/msfjarvis/aps/crypto/PGPainlessCryptoHandler : dev/msfjarvis/aps/data/crypto/CryptoHandler {
1+
public final class dev/msfjarvis/aps/crypto/PGPainlessCryptoHandler : dev/msfjarvis/aps/crypto/CryptoHandler {
22
public fun <init> ()V
33
public fun canHandle (Ljava/lang/String;)Z
44
public fun decrypt (Ljava/lang/String;Ljava/lang/String;Ljava/io/InputStream;Ljava/io/OutputStream;)V

Diff for: ‎crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/PGPainlessCryptoHandler.kt

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package dev.msfjarvis.aps.crypto
77

8-
import dev.msfjarvis.aps.data.crypto.CryptoHandler
98
import java.io.ByteArrayInputStream
109
import java.io.InputStream
1110
import java.io.OutputStream

0 commit comments

Comments
 (0)