From 5270bd8a5fec49e023b16fd4db5880b0c3f6ca63 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 28 Apr 2015 16:47:58 +0200 Subject: [PATCH] In-app view ask user for phone number and password --- res/layout/in_app_store.xml | 134 +++++++++- .../purchase/InAppPurchaseActivity.java | 231 +++++++++++++++++- .../purchase/InAppPurchaseHelper.java | 8 +- 3 files changed, 348 insertions(+), 25 deletions(-) diff --git a/res/layout/in_app_store.xml b/res/layout/in_app_store.xml index d6ec049d1..9ea941d5a 100644 --- a/res/layout/in_app_store.xml +++ b/res/layout/in_app_store.xml @@ -1,26 +1,140 @@ - + android:layout_height="match_parent" + android:background="@drawable/background" + android:orientation="vertical" > - + android:text="@string/setup_title_assistant"/> + + + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/org/linphone/purchase/InAppPurchaseActivity.java b/src/org/linphone/purchase/InAppPurchaseActivity.java index fd6b086af..9a2b2d8c3 100644 --- a/src/org/linphone/purchase/InAppPurchaseActivity.java +++ b/src/org/linphone/purchase/InAppPurchaseActivity.java @@ -18,20 +18,34 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +import java.net.URL; import java.util.ArrayList; +import java.util.Locale; +import org.linphone.LinphoneManager; import org.linphone.R; +import org.linphone.core.LinphoneProxyConfig; import org.linphone.mediastream.Log; import android.app.Activity; import android.content.Intent; import android.os.Bundle; +import android.os.Handler; +import android.text.Editable; +import android.text.InputFilter; +import android.text.Spanned; +import android.text.TextWatcher; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; +import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import de.timroes.axmlrpc.XMLRPCCallback; +import de.timroes.axmlrpc.XMLRPCClient; +import de.timroes.axmlrpc.XMLRPCException; +import de.timroes.axmlrpc.XMLRPCServerException; /** * @author Sylvain Berfini @@ -40,6 +54,15 @@ public class InAppPurchaseActivity extends Activity implements InAppPurchaseList private InAppPurchaseHelper inAppPurchaseHelper; private LinearLayout purchasableItemsLayout; private ArrayList purchasedItems; + private ImageView buyItemButton; + + private EditText username, password, passwordConfirm; + private TextView errorMessage; + private Handler mHandler = new Handler(); + private char[] acceptedChars = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '+' }; + private boolean usernameOk = false; + private boolean passwordOk = false; + private boolean confirmPasswordOk = false; @Override protected void onCreate(Bundle savedInstanceState) { @@ -49,6 +72,31 @@ public class InAppPurchaseActivity extends Activity implements InAppPurchaseList setContentView(R.layout.in_app_store); purchasableItemsLayout = (LinearLayout) findViewById(R.id.purchasable_items); + + username = (EditText) findViewById(R.id.setup_username); + ImageView usernameOkIV = (ImageView) findViewById(R.id.setup_username_ok); + addXMLRPCUsernameHandler(username, usernameOkIV); + InputFilter filter = new InputFilter(){ + @Override + public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) { + if (end > start) { + for (int index = start; index < end; index++) { + if (!new String(acceptedChars).contains(String.valueOf(source.charAt(index)))) { + return ""; + } + } + } + return null; + } + }; + username.setFilters(new InputFilter[] { filter }); + password = (EditText) findViewById(R.id.setup_password); + passwordConfirm = (EditText) findViewById(R.id.setup_password_confirm); + ImageView passwordOkIV = (ImageView) findViewById(R.id.setup_password_ok); + addXMLRPCPasswordHandler(password, passwordOkIV); + ImageView passwordConfirmOkIV = (ImageView) findViewById(R.id.setup_confirm_password_ok); + addXMLRPCConfirmPasswordHandler(password, passwordConfirm, passwordConfirmOkIV); + errorMessage = (TextView) findViewById(R.id.setup_error); } @Override @@ -59,6 +107,7 @@ public class InAppPurchaseActivity extends Activity implements InAppPurchaseList @Override public void onServiceAvailableForQueries() { + inAppPurchaseHelper.getAvailableItemsForPurchaseAsync(); inAppPurchaseHelper.getPurchasedItemsAsync(); } @@ -69,25 +118,22 @@ public class InAppPurchaseActivity extends Activity implements InAppPurchaseList for (Purchasable item : items) { View layout = LayoutInflater.from(this).inflate(R.layout.in_app_purchasable, purchasableItemsLayout); TextView text = (TextView) layout.findViewById(R.id.text); - text.setText(item.getTitle() + " " + item.getPrice()); + text.setText("Buy account (" + item.getPrice() + ")"); ImageView image = (ImageView) layout.findViewById(R.id.image); image.setTag(item); image.setOnClickListener(this); - for (Purchasable purchasedItem : purchasedItems) { - Log.d("[In-app purchase] Found already bought item, expires " + purchasedItem.getExpireDate()); - if (purchasedItem.getId().equals(item.getId())) { - image.setEnabled(false); - text.setEnabled(false); - } - } + buyItemButton = image; + buyItemButton.setEnabled(usernameOk && passwordOk && confirmPasswordOk); } } @Override public void onPurchasedItemsQueryFinished(ArrayList items) { purchasedItems = items; - inAppPurchaseHelper.getAvailableItemsForPurchaseAsync(); + for (Purchasable purchasedItem : purchasedItems) { + Log.d("[In-app purchase] Found already bought item, expires " + purchasedItem.getExpireDate()); + } } @Override @@ -100,11 +146,174 @@ public class InAppPurchaseActivity extends Activity implements InAppPurchaseList @Override public void onClick(View v) { Purchasable item = (Purchasable) v.getTag(); - inAppPurchaseHelper.purchaseItemAsync(item.getId(), "sylvain@sip.linphone.org"); + inAppPurchaseHelper.purchaseItemAsync(item.getId(), getUsername()); } @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - inAppPurchaseHelper.parseAndVerifyPurchaseItemResultAsync(requestCode, resultCode, data); + inAppPurchaseHelper.parseAndVerifyPurchaseItemResultAsync(requestCode, resultCode, data, getUsername(), password.getText().toString()); + } + + private String getUsername() { + String username = this.username.getText().toString(); + LinphoneProxyConfig lpc = LinphoneManager.getLc().createProxyConfig(); + username = lpc.normalizePhoneNumber(username); + return username.toLowerCase(Locale.getDefault()); + } + + private boolean isUsernameCorrect(String username) { + return username.matches("^(\\+)?(\\d-)?(\\d{3}-)?(\\d{3}-)?\\d{4,}$"); + } + + private void isUsernameRegistred(String username, final ImageView icon) { + final Runnable runNotReachable = new Runnable() { + public void run() { + errorMessage.setText(R.string.wizard_server_unavailable); + usernameOk = false; + icon.setImageResource(R.drawable.wizard_notok); + buyItemButton.setEnabled(usernameOk && passwordOk && confirmPasswordOk); + } + }; + + try { + XMLRPCClient client = new XMLRPCClient(new URL(getString(R.string.wizard_url))); + + XMLRPCCallback listener = new XMLRPCCallback() { + Runnable runNotOk = new Runnable() { + public void run() { + errorMessage.setText(R.string.wizard_username_unavailable); + usernameOk = false; + icon.setImageResource(R.drawable.wizard_notok); + buyItemButton.setEnabled(usernameOk && passwordOk && confirmPasswordOk); + } + }; + + Runnable runOk = new Runnable() { + public void run() { + errorMessage.setText(""); + usernameOk = true; + icon.setImageResource(R.drawable.wizard_ok); + buyItemButton.setEnabled(usernameOk && passwordOk && confirmPasswordOk); + } + }; + + public void onResponse(long id, Object result) { + int answer = (Integer) result; + if (answer != 0) { + mHandler.post(runNotOk); + } + else { + mHandler.post(runOk); + } + } + + public void onError(long id, XMLRPCException error) { + mHandler.post(runNotReachable); + } + + public void onServerError(long id, XMLRPCServerException error) { + mHandler.post(runNotReachable); + } + }; + + client.callAsync(listener, "check_account", username); + } + catch(Exception ex) { + mHandler.post(runNotReachable); + } + } + + private boolean isPasswordCorrect(String password) { + return password.length() >= 6; + } + + private void addXMLRPCUsernameHandler(final EditText field, final ImageView icon) { + field.addTextChangedListener(new TextWatcher() { + public void afterTextChanged(Editable s) { + + } + + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + public void onTextChanged(CharSequence s, int start, int count, int after) { + usernameOk = false; + String username = field.getText().toString().toLowerCase(Locale.getDefault()); + if (isUsernameCorrect(username)) { + LinphoneProxyConfig lpc = LinphoneManager.getLc().createProxyConfig(); + username = lpc.normalizePhoneNumber(username); + isUsernameRegistred(username, icon); + } else { + errorMessage.setText(R.string.wizard_username_incorrect); + icon.setImageResource(R.drawable.wizard_notok); + } + } + }); + } + + private void addXMLRPCPasswordHandler(final EditText field1, final ImageView icon) { + TextWatcher passwordListener = new TextWatcher() { + public void afterTextChanged(Editable s) { + + } + + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + public void onTextChanged(CharSequence s, int start, int count, int after) + { + passwordOk = false; + if (isPasswordCorrect(field1.getText().toString())) { + passwordOk = true; + icon.setImageResource(R.drawable.wizard_ok); + errorMessage.setText(""); + } + else { + errorMessage.setText(R.string.wizard_password_incorrect); + icon.setImageResource(R.drawable.wizard_notok); + } + buyItemButton.setEnabled(usernameOk && passwordOk && confirmPasswordOk); + } + }; + + field1.addTextChangedListener(passwordListener); + } + + private void addXMLRPCConfirmPasswordHandler(final EditText field1, final EditText field2, final ImageView icon) { + TextWatcher passwordListener = new TextWatcher() { + public void afterTextChanged(Editable s) { + + } + + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + public void onTextChanged(CharSequence s, int start, int count, int after) + { + confirmPasswordOk = false; + if (field1.getText().toString().equals(field2.getText().toString())) { + confirmPasswordOk = true; + icon.setImageResource(R.drawable.wizard_ok); + + if (!isPasswordCorrect(field1.getText().toString())) { + errorMessage.setText(R.string.wizard_password_incorrect); + } + else { + errorMessage.setText(""); + } + } + else { + errorMessage.setText(R.string.wizard_passwords_unmatched); + icon.setImageResource(R.drawable.wizard_notok); + } + buyItemButton.setEnabled(usernameOk && passwordOk && confirmPasswordOk); + } + }; + + field1.addTextChangedListener(passwordListener); + field2.addTextChangedListener(passwordListener); } } diff --git a/src/org/linphone/purchase/InAppPurchaseHelper.java b/src/org/linphone/purchase/InAppPurchaseHelper.java index 52e80807b..6309be55c 100644 --- a/src/org/linphone/purchase/InAppPurchaseHelper.java +++ b/src/org/linphone/purchase/InAppPurchaseHelper.java @@ -293,7 +293,7 @@ public class InAppPurchaseHelper { }).start(); } - public void parseAndVerifyPurchaseItemResultAsync(int requestCode, int resultCode, Intent data) { + public void parseAndVerifyPurchaseItemResultAsync(int requestCode, int resultCode, Intent data, String username, String password) { if (requestCode == ACTIVITY_RESULT_CODE_PURCHASE_ITEM) { int responseCode = data.getIntExtra(RESPONSE_CODE, 0); String purchaseData = data.getStringExtra(RESPONSE_INAPP_PURCHASE_DATA); @@ -307,7 +307,7 @@ public class InAppPurchaseHelper { mListener.onPurchasedItemConfirmationQueryFinished(item); } } - }, purchaseData, signature); + }, purchaseData, signature, username, password); } else { Log.e("[In-app purchase] Error: resultCode is " + resultCode + " and responseCode is " + responseCodeToErrorMessage(responseCode)); } @@ -369,7 +369,7 @@ public class InAppPurchaseHelper { return null; } - private void verifySignatureAndCreateAccountAsync(final VerifiedSignatureListener listener, final String purchasedData, String signature) { + private void verifySignatureAndCreateAccountAsync(final VerifiedSignatureListener listener, final String purchasedData, String signature, String username, String password) { XMLRPCClient client = null; try { client = new XMLRPCClient(new URL(LinphonePreferences.instance().getInAppPurchaseValidatingServerUrl())); @@ -414,7 +414,7 @@ public class InAppPurchaseHelper { Log.e(error); Log.e("[In-app purchase] Server can't validate the payload and it's signature !"); } - }, "create_account_from_in_app_purchase", mGmailAccount, "sylvain@sip.linphone.org", "toto", purchasedData, signature, "google"); + }, "create_account_from_in_app_purchase", mGmailAccount, username + "@sip.linphone.org", password, purchasedData, signature, "google"); } }