rename module

Outblock · Sep 18, 2022 · 819e6db · 819e6db
1 parent 43bafab
commit 819e6db
Show file tree

Hide file tree

Showing 54 changed files with 12 additions and 11 deletions.
diff --git a/example/build.gradle b/example/build.gradle
@@ -32,8 +32,7 @@ android {
 }
 
 dependencies {
-    implementation project(path: ':fcl-android')
-
+    implementation project(path: ':fcl')
     implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.3.0'

diff --git a/fcl-android/.gitignore → fcl/.gitignore b/fcl-android/.gitignore → fcl/.gitignore
diff --git a/fcl-android/build.gradle → fcl/build.gradle b/fcl-android/build.gradle → fcl/build.gradle
diff --git a/fcl-android/consumer-rules.pro → fcl/consumer-rules.pro b/fcl-android/consumer-rules.pro → fcl/consumer-rules.pro
diff --git a/fcl-android/proguard-rules.pro → fcl/proguard-rules.pro b/fcl-android/proguard-rules.pro → fcl/proguard-rules.pro
diff --git a/...o/outblock/fcl/ExampleInstrumentedTest.kt → ...o/outblock/fcl/ExampleInstrumentedTest.kt b/...o/outblock/fcl/ExampleInstrumentedTest.kt → ...o/outblock/fcl/ExampleInstrumentedTest.kt
@@ -1,13 +1,11 @@
 package io.outblock.fcl
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

diff --git a/fcl-android/src/main/AndroidManifest.xml → fcl/src/main/AndroidManifest.xml b/fcl-android/src/main/AndroidManifest.xml → fcl/src/main/AndroidManifest.xml
diff --git a/...roid/src/main/java/io/outblock/fcl/Fcl.kt → fcl/src/main/java/io/outblock/fcl/Fcl.kt b/...roid/src/main/java/io/outblock/fcl/Fcl.kt → fcl/src/main/java/io/outblock/fcl/Fcl.kt
@@ -161,7 +161,6 @@ object Fcl {
 
     fun verifyAccountProof(includeDomainTag: Boolean = false): FclResult<Boolean> {
         assert(Thread.currentThread() != Looper.getMainLooper().thread) { "can't call this method in main thread." }
-
         return processResult {
             runBlocking { AccountProofRequest().request(includeDomainTag) }
         }

diff --git a/.../src/main/java/io/outblock/fcl/FlowApi.kt → fcl/src/main/java/io/outblock/fcl/FlowApi.kt b/.../src/main/java/io/outblock/fcl/FlowApi.kt → fcl/src/main/java/io/outblock/fcl/FlowApi.kt
diff --git a/.../java/io/outblock/fcl/cadence/Cadences.kt → .../java/io/outblock/fcl/cadence/Cadences.kt b/.../java/io/outblock/fcl/cadence/Cadences.kt → .../java/io/outblock/fcl/cadence/Cadences.kt
diff --git a/...ain/java/io/outblock/fcl/config/Config.kt → ...ain/java/io/outblock/fcl/config/Config.kt b/...ain/java/io/outblock/fcl/config/Config.kt → ...ain/java/io/outblock/fcl/config/Config.kt
diff --git a/...block/fcl/lifecycle/FCLContentProvider.kt → ...block/fcl/lifecycle/FCLContentProvider.kt b/...block/fcl/lifecycle/FCLContentProvider.kt → ...block/fcl/lifecycle/FCLContentProvider.kt
diff --git a/...tblock/fcl/lifecycle/LifecycleObserver.kt → ...tblock/fcl/lifecycle/LifecycleObserver.kt b/...tblock/fcl/lifecycle/LifecycleObserver.kt → ...tblock/fcl/lifecycle/LifecycleObserver.kt
diff --git a/.../java/io/outblock/fcl/models/FclResult.kt → .../java/io/outblock/fcl/models/FclResult.kt b/.../java/io/outblock/fcl/models/FclResult.kt → .../java/io/outblock/fcl/models/FclResult.kt
diff --git a/...n/java/io/outblock/fcl/models/Signable.kt → ...n/java/io/outblock/fcl/models/Signable.kt b/...n/java/io/outblock/fcl/models/Signable.kt → ...n/java/io/outblock/fcl/models/Signable.kt
diff --git a/...ck/fcl/models/response/PollingResponse.kt → ...ck/fcl/models/response/PollingResponse.kt b/...ck/fcl/models/response/PollingResponse.kt → ...ck/fcl/models/response/PollingResponse.kt
diff --git a/...ock/fcl/models/response/ResponseStatus.kt → ...ock/fcl/models/response/ResponseStatus.kt b/...ock/fcl/models/response/ResponseStatus.kt → ...ock/fcl/models/response/ResponseStatus.kt
diff --git a/...java/io/outblock/fcl/provider/Provider.kt → ...java/io/outblock/fcl/provider/Provider.kt b/...java/io/outblock/fcl/provider/Provider.kt → ...java/io/outblock/fcl/provider/Provider.kt
diff --git a/...tblock/fcl/request/AccountProofRequest.kt → ...tblock/fcl/request/AccountProofRequest.kt b/...tblock/fcl/request/AccountProofRequest.kt → ...tblock/fcl/request/AccountProofRequest.kt
diff --git a/...a/io/outblock/fcl/request/AuthnRequest.kt → ...a/io/outblock/fcl/request/AuthnRequest.kt b/...a/io/outblock/fcl/request/AuthnRequest.kt → ...a/io/outblock/fcl/request/AuthnRequest.kt
diff --git a/...a/io/outblock/fcl/request/AuthzRequest.kt → ...a/io/outblock/fcl/request/AuthzRequest.kt b/...a/io/outblock/fcl/request/AuthzRequest.kt → ...a/io/outblock/fcl/request/AuthzRequest.kt
diff --git a/...utblock/fcl/request/SignMessageRequest.kt → ...utblock/fcl/request/SignMessageRequest.kt b/...utblock/fcl/request/SignMessageRequest.kt → ...utblock/fcl/request/SignMessageRequest.kt
@@ -11,6 +11,7 @@ import io.outblock.fcl.utils.FclException
 internal class SignMessageRequest {
 
     suspend fun request(message: String): SignMessageResponse {
+        Fcl.currentUser ?: throw FclException(FclError.unauthenticated)
         val service = Fcl.currentUser?.services?.first { it.type == FCLServiceType.userSignature.value }
             ?: throw FclException(FclError.invaildService)
 

diff --git a/...utblock/fcl/request/builder/FclBuilder.kt → ...utblock/fcl/request/builder/FclBuilder.kt b/...utblock/fcl/request/builder/FclBuilder.kt → ...utblock/fcl/request/builder/FclBuilder.kt
diff --git a/.../fcl/request/resolver/AccountsResolver.kt → .../fcl/request/resolver/AccountsResolver.kt b/.../fcl/request/resolver/AccountsResolver.kt → .../fcl/request/resolver/AccountsResolver.kt
diff --git a/...k/fcl/request/resolver/CadenceResolver.kt → ...k/fcl/request/resolver/CadenceResolver.kt b/...k/fcl/request/resolver/CadenceResolver.kt → ...k/fcl/request/resolver/CadenceResolver.kt
diff --git a/.../fcl/request/resolver/RefBlockResolver.kt → .../fcl/request/resolver/RefBlockResolver.kt b/.../fcl/request/resolver/RefBlockResolver.kt → .../fcl/request/resolver/RefBlockResolver.kt
diff --git a/...outblock/fcl/request/resolver/Resolver.kt → ...outblock/fcl/request/resolver/Resolver.kt b/...outblock/fcl/request/resolver/Resolver.kt → ...outblock/fcl/request/resolver/Resolver.kt
diff --git a/...equest/resolver/SequenceNumberResolver.kt → ...equest/resolver/SequenceNumberResolver.kt b/...equest/resolver/SequenceNumberResolver.kt → ...equest/resolver/SequenceNumberResolver.kt
diff --git a/...fcl/request/resolver/SignatureResolver.kt → ...fcl/request/resolver/SignatureResolver.kt b/...fcl/request/resolver/SignatureResolver.kt → ...fcl/request/resolver/SignatureResolver.kt
diff --git a/...io/outblock/fcl/strategies/HttpPostRpc.kt → ...io/outblock/fcl/strategies/HttpPostRpc.kt b/...io/outblock/fcl/strategies/HttpPostRpc.kt → ...io/outblock/fcl/strategies/HttpPostRpc.kt
diff --git a/.../io/outblock/fcl/strategies/Strategies.kt → .../io/outblock/fcl/strategies/Strategies.kt b/.../io/outblock/fcl/strategies/Strategies.kt → .../io/outblock/fcl/strategies/Strategies.kt
diff --git a/...ock/fcl/strategies/walletconnect/Utils.kt → ...ock/fcl/strategies/walletconnect/Utils.kt b/...ock/fcl/strategies/walletconnect/Utils.kt → ...ock/fcl/strategies/walletconnect/Utils.kt
diff --git a/...strategies/walletconnect/WalletConnect.kt → ...strategies/walletconnect/WalletConnect.kt b/...strategies/walletconnect/WalletConnect.kt → ...strategies/walletconnect/WalletConnect.kt
diff --git a/...alletconnect/WalletConnectDappDelegate.kt → ...alletconnect/WalletConnectDappDelegate.kt b/...alletconnect/WalletConnectDappDelegate.kt → ...alletconnect/WalletConnectDappDelegate.kt
diff --git a/...tegies/walletconnect/WalletConnectHook.kt → ...tegies/walletconnect/WalletConnectHook.kt b/...tegies/walletconnect/WalletConnectHook.kt → ...tegies/walletconnect/WalletConnectHook.kt
diff --git a/...gies/walletconnect/WalletConnectMethod.kt → ...gies/walletconnect/WalletConnectMethod.kt b/...gies/walletconnect/WalletConnectMethod.kt → ...gies/walletconnect/WalletConnectMethod.kt
diff --git a/...ies/walletconnect/WalletConnectSession.kt → ...ies/walletconnect/WalletConnectSession.kt b/...ies/walletconnect/WalletConnectSession.kt → ...ies/walletconnect/WalletConnectSession.kt
diff --git a/...ock/fcl/strategies/walletconnect/WcRpc.kt → ...ock/fcl/strategies/walletconnect/WcRpc.kt b/...ock/fcl/strategies/walletconnect/WcRpc.kt → ...ock/fcl/strategies/walletconnect/WcRpc.kt
diff --git a/...ava/io/outblock/fcl/utils/ContextUtils.kt → ...ava/io/outblock/fcl/utils/ContextUtils.kt b/...ava/io/outblock/fcl/utils/ContextUtils.kt → ...ava/io/outblock/fcl/utils/ContextUtils.kt
diff --git a/...a/io/outblock/fcl/utils/CoroutineUtils.kt → ...a/io/outblock/fcl/utils/CoroutineUtils.kt b/...a/io/outblock/fcl/utils/CoroutineUtils.kt → ...a/io/outblock/fcl/utils/CoroutineUtils.kt
diff --git a/...in/java/io/outblock/fcl/utils/FclError.kt → ...in/java/io/outblock/fcl/utils/FclError.kt b/...in/java/io/outblock/fcl/utils/FclError.kt → ...in/java/io/outblock/fcl/utils/FclError.kt
diff --git a/...va/io/outblock/fcl/utils/FclExtensions.kt → ...va/io/outblock/fcl/utils/FclExtensions.kt b/...va/io/outblock/fcl/utils/FclExtensions.kt → ...va/io/outblock/fcl/utils/FclExtensions.kt
@@ -1,5 +1,6 @@
 package io.outblock.fcl.utils
 
+import android.os.Looper
 import androidx.annotation.WorkerThread
 import com.nftco.flow.sdk.FlowBlock
 import com.nftco.flow.sdk.bytesToHex
@@ -18,6 +19,9 @@ fun Fcl.getLatestBlock(sealed: Boolean = true): FlowBlock {
 
 @WorkerThread
 fun Fcl.verifyUserSignature(message: String, signatures: List<SignMessageResponse>): Boolean {
+    assert(Thread.currentThread() != Looper.getMainLooper().thread) { "can't call this method in main thread." }
+    currentUser ?: throw FclException(FclError.unauthenticated)
+
     val result = query {
         cadence(CADENCE_VERIFY_USER_SIGNATURE)
         arg { address(signatures.firstOrNull()?.address.orEmpty()) }

diff --git a/...a/io/outblock/fcl/utils/FlowFieldUtils.kt → ...a/io/outblock/fcl/utils/FlowFieldUtils.kt b/...a/io/outblock/fcl/utils/FlowFieldUtils.kt → ...a/io/outblock/fcl/utils/FlowFieldUtils.kt
diff --git a/...n/java/io/outblock/fcl/utils/JsonUtils.kt → ...n/java/io/outblock/fcl/utils/JsonUtils.kt b/...n/java/io/outblock/fcl/utils/JsonUtils.kt → ...n/java/io/outblock/fcl/utils/JsonUtils.kt
diff --git a/...rc/main/java/io/outblock/fcl/utils/Log.kt → ...rc/main/java/io/outblock/fcl/utils/Log.kt b/...rc/main/java/io/outblock/fcl/utils/Log.kt → ...rc/main/java/io/outblock/fcl/utils/Log.kt
diff --git a/...va/io/outblock/fcl/utils/SignableUtils.kt → ...va/io/outblock/fcl/utils/SignableUtils.kt b/...va/io/outblock/fcl/utils/SignableUtils.kt → ...va/io/outblock/fcl/utils/SignableUtils.kt
diff --git a/...io/outblock/fcl/utils/StringExtensions.kt → ...io/outblock/fcl/utils/StringExtensions.kt b/...io/outblock/fcl/utils/StringExtensions.kt → ...io/outblock/fcl/utils/StringExtensions.kt
diff --git a/...utblock/fcl/utils/parse/FclResultParse.kt → ...utblock/fcl/utils/parse/FclResultParse.kt b/...utblock/fcl/utils/parse/FclResultParse.kt → ...utblock/fcl/utils/parse/FclResultParse.kt
diff --git a/...ava/io/outblock/fcl/webview/FCLWebView.kt → ...ava/io/outblock/fcl/webview/FCLWebView.kt b/...ava/io/outblock/fcl/webview/FCLWebView.kt → ...ava/io/outblock/fcl/webview/FCLWebView.kt
diff --git a/...o/outblock/fcl/webview/WebViewActivity.kt → ...o/outblock/fcl/webview/WebViewActivity.kt b/...o/outblock/fcl/webview/WebViewActivity.kt → ...o/outblock/fcl/webview/WebViewActivity.kt
diff --git a/...a/io/outblock/fcl/webview/WebViewUtils.kt → ...a/io/outblock/fcl/webview/WebViewUtils.kt b/...a/io/outblock/fcl/webview/WebViewUtils.kt → ...a/io/outblock/fcl/webview/WebViewUtils.kt
diff --git a/fcl-android/src/main/res/values/themes.xml → fcl/src/main/res/values/themes.xml b/fcl-android/src/main/res/values/themes.xml → fcl/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="AppTheme">
-    </style>
+<resources>
+
+    <style name="AppTheme"></style>
 
     <style name="AppTheme.Transparent">
         <item name="android:windowIsTranslucent">true</item>

diff --git a/...t/java/io/outblock/fcl/ExampleUnitTest.kt → ...t/java/io/outblock/fcl/ExampleUnitTest.kt b/...t/java/io/outblock/fcl/ExampleUnitTest.kt → ...t/java/io/outblock/fcl/ExampleUnitTest.kt
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,3 @@
 rootProject.name = "fcl-android"
 include ':example'
-include ':fcl-android'
+include ':fcl'