diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 72f09bd523..ab525be802 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -76,12 +76,12 @@ - - - - - - + + + + + + diff --git a/dmz/src/main/java/com/alphawallet/token/web/AppSiteController.java b/dmz/src/main/java/com/alphawallet/token/web/AppSiteController.java index 11d4e5eee4..c6750f3fcb 100644 --- a/dmz/src/main/java/com/alphawallet/token/web/AppSiteController.java +++ b/dmz/src/main/java/com/alphawallet/token/web/AppSiteController.java @@ -1,23 +1,34 @@ package com.alphawallet.token.web; +import static com.alphawallet.token.tools.Convert.getEthString; +import static com.alphawallet.token.tools.ParseMagicLink.normal; +import static com.alphawallet.token.web.Ethereum.TokenscriptFunction.ZERO_ADDRESS; + import com.alphawallet.token.entity.Attribute; -import com.github.cliftonlabs.json_simple.JsonObject; +import com.alphawallet.token.entity.AttributeInterface; +import com.alphawallet.token.entity.ContractAddress; +import com.alphawallet.token.entity.ContractInfo; +import com.alphawallet.token.entity.MagicLinkData; +import com.alphawallet.token.entity.MagicLinkInfo; +import com.alphawallet.token.entity.NonFungibleToken; +import com.alphawallet.token.entity.SalesOrderMalformed; +import com.alphawallet.token.entity.TokenScriptResult; +import com.alphawallet.token.entity.TransactionResult; +import com.alphawallet.token.tools.ParseMagicLink; +import com.alphawallet.token.tools.TokenDefinition; +import com.alphawallet.token.web.Ethereum.TokenscriptFunction; +import com.alphawallet.token.web.Ethereum.TransactionHandler; +import com.alphawallet.token.web.Service.CryptoFunctions; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.NoHandlerFoundException; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.view.RedirectView; @@ -31,7 +42,6 @@ import java.nio.file.Files; import java.nio.file.NoSuchFileException; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -44,27 +54,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.servlet.http.HttpServletRequest; -import com.alphawallet.token.entity.AttributeInterface; -import com.alphawallet.token.entity.ContractAddress; -import com.alphawallet.token.entity.ContractInfo; -import com.alphawallet.token.entity.MagicLinkData; -import com.alphawallet.token.entity.MagicLinkInfo; -import com.alphawallet.token.entity.NonFungibleToken; -import com.alphawallet.token.entity.SalesOrderMalformed; -import com.alphawallet.token.entity.XMLDsigVerificationResult; -import com.alphawallet.token.entity.TokenScriptResult; -import com.alphawallet.token.entity.TransactionResult; -import com.alphawallet.token.tools.ParseMagicLink; -import com.alphawallet.token.tools.TokenDefinition; -import com.alphawallet.token.tools.XMLDSigVerifier; -import com.alphawallet.token.web.Ethereum.TokenscriptFunction; -import com.alphawallet.token.web.Ethereum.TransactionHandler; -import com.alphawallet.token.web.Service.CryptoFunctions; -import static com.alphawallet.token.tools.Convert.getEthString; -import static com.alphawallet.token.tools.ParseMagicLink.normal; -import static com.alphawallet.token.web.Ethereum.TokenscriptFunction.ZERO_ADDRESS; +import javax.servlet.http.HttpServletRequest; @Controller @SpringBootApplication @@ -95,6 +86,7 @@ public class AppSiteController implements AttributeInterface " \"package_name\": \"io.stormbird.wallet\",\n" + " \"sha256_cert_fingerprints\": [\n" + " \"8E:1E:C7:92:44:E2:AE:8F:5E:BE:A6:09:E5:CC:05:8F:01:9F:67:F4:A6:FF:E7:60:6E:DA:C8:64:8F:29:AB:C0\"\n" + + " \"54:5B:5D:DE:90:45:11:98:14:5C:90:32:C6:AE:F6:85:C3:7D:F5:72:75:FF:25:07:0E:13:03:11:61:66:6A:E3\"\n" + " ]\n" + " }\n" + " }\n" + @@ -573,4 +565,4 @@ public static String getInfuraKey() { return infuraKey; } -} \ No newline at end of file +}