#APPC-C

.gitignore

@@ -25,6 +25,7 @@ gen/
 .gradle/
 /build
 app/release
+app/debug
 
 # Fastlane
 fastlane/report.xml
@@ -42,4 +43,5 @@ proguard/
 .navigation/
 
 ### Android Patch ###
-gen-external-apklibs
+gen-external-apklibs
+/app/google-services.json

README.md

@@ -1,9 +1,9 @@
-# ASF Wallet for Android
+# AppCoins Wallet for Android
 
 [![Build Status](https://travis-ci.org/TrustWallet/trust-wallet-android.svg?branch=master)](https://travis-ci.org/TrustWallet/trust-wallet-android)
 [![License](https://img.shields.io/badge/license-GPL3-green.svg?style=flat)](https://github.com/fastlane/fastlane/blob/master/LICENSE)
 
-Welcome to ASF Wallet's open source Android app!
+Welcome to AppCoins Wallet's open source Android app!
 
 ## Getting Started
 
@@ -14,7 +14,7 @@ Welcome to ASF Wallet's open source Android app!
 ## Contributing
 
 As an open source project, it is our intention that this project may receive 
-contributions from the community. Ultimately, our goal in the ASF is to build
+contributions from the community. Ultimately, our goal in the AppCoins is to build
 technology that is useful to our users.
 
 In order to submit feedback and report bugs, we consider the best way is to open 
@@ -24,4 +24,4 @@ and steps to reproduce the reported bugs.
 
 ## Credit
 
-We forked the [Trust Wallet](https://trustwalletapp.com) for Android project to bootstrap the ASF wallet development. We considered it the best alternative regarding already implemented functionalities and forked it with the intention to contribute back with implementations and work that would be considered relevant. 
+We forked the [Trust Wallet](https://trustwalletapp.com) for Android project to bootstrap the ASF wallet development. We considered it the best alternative regarding already implemented functionalities and forked it with the intention to contribute back with implementations and work that would be considered relevant.

airdrop/build.gradle

@@ -1,17 +1,12 @@
 apply plugin: 'java-library'
 
-
-repositories {
-  maven { url 'https://maven.fabric.io/public' }
-}
-
 dependencies {
   implementation fileTree(dir: 'libs', include: ['*.jar'])
-  implementation "com.squareup.retrofit2:adapter-rxjava2:$project.retrofitVersion"
-  implementation "com.google.code.gson:gson:$project.gsonVersion"
-  implementation "org.jetbrains:annotations:$project.jetbrainsAnnotationsVersion"
-  testImplementation "junit:junit:$project.junitVersion"
-  testImplementation "org.mockito:mockito-core:$project.mockitoCoreVersion"
+  implementation "com.squareup.retrofit2:adapter-rxjava2:$project.retrofit_version"
+  implementation "com.google.code.gson:gson:$project.gson_version"
+  implementation "org.jetbrains:annotations:$project.jetbrains_annotations_version"
+  testImplementation "junit:junit:$project.junit_version"
+  testImplementation "org.mockito:mockito-core:$project.mockito_version"
 }
 
 sourceCompatibility = "1.8"

airdrop/src/main/java/com/asfoundation/wallet/Airdrop.java

@@ -29,7 +29,7 @@ public void request(String walletAddress, int chainId, String captchaAnswer) {
         .flatMapCompletable(airDropResponse -> {
           switch (airDropResponse.getStatus()) {
             case WRONG_CAPTCHA:
-              return Completable.fromAction(() -> publishCaptchaError());
+              return Completable.fromAction(this::publishCaptchaError);
             default:
             case OK:
               return waitForTransactions(airDropResponse);
@@ -50,11 +50,10 @@ public void stop() {
   private Completable waitForTransactions(AirdropService.AirDropResponse airDropResponse) {
     return Single.fromCallable(() -> {
       List<Completable> list = new ArrayList<>();
+      list.add(transactionService.waitForTransactionToComplete(
+          airDropResponse.getAppcoinsTransaction()));
       list.add(
-          transactionService.waitForTransactionToComplete(airDropResponse.getAppcoinsTransaction(),
-              airDropResponse.getChainId()));
-      list.add(transactionService.waitForTransactionToComplete(airDropResponse.getEthTransaction(),
-          airDropResponse.getChainId()));
+          transactionService.waitForTransactionToComplete(airDropResponse.getEthTransaction()));
       return list;
     })
         .flatMapCompletable(list -> Completable.merge(list)

airdrop/src/main/java/com/asfoundation/wallet/AirdropService.java

@@ -25,7 +25,7 @@ public AirdropService(Api api, Gson gson, Scheduler scheduler) {
     this.scheduler = scheduler;
   }
 
-  public Single<AirDropResponse> requestAirdrop(String walletAddress, Integer chainId,
+  Single<AirDropResponse> requestAirdrop(String walletAddress, Integer chainId,
       String captchaAnswer) {
     return api.requestCoins(walletAddress, chainId, captchaAnswer)
         .subscribeOn(scheduler)
@@ -46,7 +46,7 @@ public Single<AirDropResponse> requestAirdrop(String walletAddress, Integer chai
         });
   }
 
-  public Single<String> requestCaptcha(String walletAddress) {
+  Single<String> requestCaptcha(String walletAddress) {
     return api.requestCaptcha(walletAddress)
         .map(CaptchaResponse::getUrl);
   }
@@ -72,12 +72,8 @@ public static class AirDropResponse {
     @SerializedName("chain_id") private int chainId;
     @SerializedName("description") private String description;
 
-    private AirDropResponse() {
-      status = Status.OK;
-    }
-
-    public AirDropResponse(Status status, String appcoinsTransaction, String ethTransaction,
-        int chainId, String description) {
+    AirDropResponse(Status status, String appcoinsTransaction, String ethTransaction, int chainId,
+        String description) {
       this.status = status;
       this.appcoinsTransaction = appcoinsTransaction;
       this.ethTransaction = ethTransaction;

airdrop/src/main/java/com/asfoundation/wallet/TransactionService.java

@@ -3,5 +3,5 @@
 import io.reactivex.Completable;
 
 public interface TransactionService {
-  Completable waitForTransactionToComplete(String transactionHash, int chainId);
+  Completable waitForTransactionToComplete(String transactionHash);
 }

airdrop/src/test/java/com/asfoundation/wallet/AirdropTest.java

@@ -10,7 +10,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
@@ -29,7 +28,7 @@
 
   @Before public void setUp() {
     when(airdropService.requestCaptcha(WALLET_ADDRESS)).thenReturn(Single.just(CAPTCHA));
-    when(transactionService.waitForTransactionToComplete(anyString(), anyInt())).thenReturn(
+    when(transactionService.waitForTransactionToComplete(anyString())).thenReturn(
         Completable.complete());
     airdrop = new Airdrop(transactionService, BehaviorSubject.create(), airdropService);
   }