Merge pull request #29 from efryntov/master

Update upstream

Author: efryntov

.idea/codeStyles/Project.xml

@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         applicationId "ca.psiphon.psicash"
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -25,7 +25,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation project(':psicashlib')
 }

.idea/compiler.xml

@@ -1,8 +1,8 @@
 package ca.psiphon.psicash;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

.idea/misc.xml

@@ -1,14 +1,16 @@
 package ca.psiphon.psicash;
 
 import android.os.AsyncTask;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.widget.TextView;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import ca.psiphon.psicashlib.PsiCashLib;
 
@@ -38,21 +40,30 @@ private class NetworkTask extends AsyncTask<Void, Void, String> {
 
         @Override
         protected String doInBackground(Void... params) {
-            PsiCashLib.Error error = psiCashLib.setRequestMetadataItem("metadatakey", "metadatavalue");
+            Map<String, String> myMap = new HashMap<String, String>() {{
+                put("a", "b");
+                put("c", "d");
+            }};
+            PsiCashLib.Error error = psiCashLib.setRequestMetadataItems(myMap);
             if (error != null) {
                 Log.e("PsiCashApp", error.message);
             }
 
-            error = psiCashLib.setRequestMetadataItem(null, "blah"); //erroneous
+
+            error = psiCashLib.setRequestMetadataItems(null); //erroneous
             if (error != null) {
                 Log.e("PsiCashApp", error.message);
             }
 
+            String accountSignupURL = psiCashLib.getAccountSignupURL();
+            String accountManagementURL = psiCashLib.getAccountManagementURL();
+            String accountForgotURL = psiCashLib.getAccountForgotURL();
+
             List<String> purchaseClasses = new ArrayList<>(Arrays.asList("speed-boost"));
-            PsiCashLib.RefreshStateResult rsr = psiCashLib.refreshState(purchaseClasses);
+            PsiCashLib.RefreshStateResult rsr = psiCashLib.refreshState(false, purchaseClasses);
 
             PsiCashLib.IsAccountResult isAccount = psiCashLib.isAccount();
-            PsiCashLib.ValidTokenTypesResult vtt = psiCashLib.validTokenTypes();
+            PsiCashLib.HasTokensResult htr = psiCashLib.hasTokens();
             PsiCashLib.BalanceResult b = psiCashLib.balance();
             PsiCashLib.GetPurchasePricesResult pp = psiCashLib.getPurchasePrices();
             PsiCashLib.GetPurchasesResult gpr = psiCashLib.getPurchases();
@@ -65,7 +76,7 @@ protected String doInBackground(Void... params) {
 
             PsiCashLib.ModifyLandingPageResult mlpr = psiCashLib.modifyLandingPage("https://example.com/foo");
             PsiCashLib.GetRewardedActivityDataResult gradr = psiCashLib.getRewardedActivityData();
-            PsiCashLib.GetDiagnosticInfoResult gdir = psiCashLib.getDiagnosticInfo();
+            PsiCashLib.GetDiagnosticInfoResult gdir = psiCashLib.getDiagnosticInfo(false);
 
             String encodedAuth = "eyJBdXRob3JpemF0aW9uIjp7IklEIjoiMFYzRXhUdmlBdFNxTGZOd2FpQXlHNHpaRUJJOGpIYnp5bFdNeU5FZ1JEZz0iLCJBY2Nlc3NUeXBlIjoic3BlZWQtYm9vc3QtdGVzdCIsIkV4cGlyZXMiOiIyMDE5LTAxLTE0VDE3OjIyOjIzLjE2ODc2NDEyOVoifSwiU2lnbmluZ0tleUlEIjoiUUNZTzV2clIvZGhjRDZ6M2FMQlVNeWRuZlJyZFNRL1RWYW1IUFhYeTd0TT0iLCJTaWduYXR1cmUiOiJQL2NrenloVUJoSk5RQ24zMnluM1VTdGpLencxU04xNW9MclVhTU9XaW9scXBOTTBzNVFSNURHVEVDT1FzQk13ODdQdTc1TGE1OGtJTHRIcW1BVzhDQT09In0=";
             PsiCashLib.DecodeAuthorizationResult authRes = PsiCashLib.decodeAuthorization(encodedAuth);

.idea/modules.xml

@@ -36,7 +36,7 @@ public PsiCashLib.HTTPRequester.Result httpRequest(PsiCashLib.HTTPRequester.ReqP
             urlConn.connect();
 
             res.code = urlConn.getResponseCode();
-            res.date = urlConn.getHeaderField("Date");
+            res.headers = urlConn.getHeaderFields();
 
             // Read the input stream into a String
             InputStream inputStream;

.idea/runConfigurations.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -16,4 +16,4 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>