TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android_calculator-56: Billing doesn't work if internet was off on the start of application

Browse Source
This commit is contained in:
Sergey Solovyev 2012-01-14 19:02:45 +04:00
parent 6f3ea4da65
commit 20392b00ad
3 changed files with 56 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/values-ru/text_strings.xml
View File

@ -170,4 +170,7 @@
<string name="c_calc_ad_free_title">Избавиться от рекламы!</string>
<string name="c_calc_ad_free_summary">Скидка 50% для первых 100 покупателей</string>
<string name="c_calc_already_purchased">Опция уже была куплена!</string>
<string name="c_calc_purchasing">Покупаем...</string>
</resources>

3
res/values/text_strings.xml
View File

@ -170,4 +170,7 @@
<string name="c_calc_ad_free_title">Get rid of ads!</string>
<string name="c_calc_ad_free_summary">50% offer for first 100 customers</string>
<string name="c_calc_already_purchased">Ad free option was already purchased!</string>
<string name="c_calc_purchasing">Purchasing...</string>
</resources>

60
src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
View File

@ -12,6 +12,7 @@ import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.util.Log;
import android.widget.Toast;
import net.robotmedia.billing.BillingController;
import net.robotmedia.billing.BillingRequest;
import net.robotmedia.billing.IBillingObserver;
@ -32,10 +33,39 @@ public class CalculatorPreferencesActivity extends PreferenceActivity implements
addPreferencesFromResource(R.xml.main_preferences);
final Preference adFreePreference = findPreference(CalculatorApplication.AD_FREE_P_KEY);
adFreePreference.setEnabled(false);
// observer must be set before net.robotmedia.billing.BillingController.checkBillingSupported()
BillingController.registerObserver(this);
// check billing support one more time as user can turn on internet while he is in current activity
switch (BillingController.checkBillingSupported(CalculatorPreferencesActivity.this)) {
case UNKNOWN:
// unknown => will wait the invocation of onBillingChecked()
Log.d(CalculatorPreferencesActivity.class.getName(), "Billing state in unknown - waiting!");
break;
case SUPPORTED:
onBillingChecked(true);
break;
case UNSUPPORTED:
onBillingChecked(false);
break;
}
final SharedPreferences preferences = getPreferenceManager().getSharedPreferences();
preferences.registerOnSharedPreferenceChangeListener(this);
onSharedPreferenceChanged(preferences, CalculatorEngine.Preferences.roundResult.getKey());
onSharedPreferenceChanged(preferences, VibratorContainer.HAPTIC_FEEDBACK_P_KEY);
}
private void setAdFreeAction() {
final Preference adFreePreference = findPreference(CalculatorApplication.AD_FREE_P_KEY);
if (!CalculatorApplication.isAdFree(this)) {
adFreePreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
Log.d(CalculatorPreferencesActivity.class.getName(), "Ad free is not purchased - enable preference!");
adFreePreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference preference) {
// check billing availability
@ -47,24 +77,28 @@ public class CalculatorPreferencesActivity extends PreferenceActivity implements
Log.d(CalculatorPreferencesActivity.class.getName(), "Billing is supported - continue!");
if (!CalculatorApplication.isAdFree(CalculatorPreferencesActivity.this)) {
Log.d(CalculatorPreferencesActivity.class.getName(), "Item not purchased - try to purchase!");
// not purchased => show purchase window for user
// not purchased => purchasing
Toast.makeText(CalculatorPreferencesActivity.this, R.string.c_calc_purchasing, Toast.LENGTH_SHORT).show();
// show purchase window for user
BillingController.requestPurchase(CalculatorPreferencesActivity.this, CalculatorApplication.AD_FREE_PRODUCT_ID, true);
} else {
// disable preference
adFreePreference.setEnabled(false);
// and show message to user
Toast.makeText(CalculatorPreferencesActivity.this, R.string.c_calc_already_purchased, Toast.LENGTH_SHORT).show();
}
}
return true;
}
});
adFreePreference.setEnabled(true);
} else {
Log.d(CalculatorPreferencesActivity.class.getName(), "Ad free is not purchased - disable preference!");
adFreePreference.setEnabled(false);
}
BillingController.registerObserver(this);
final SharedPreferences preferences = getPreferenceManager().getSharedPreferences();
preferences.registerOnSharedPreferenceChangeListener(this);
onSharedPreferenceChanged(preferences, CalculatorEngine.Preferences.roundResult.getKey());
onSharedPreferenceChanged(preferences, VibratorContainer.HAPTIC_FEEDBACK_P_KEY);
}
@Override
@ -84,7 +118,13 @@ public class CalculatorPreferencesActivity extends PreferenceActivity implements
@Override
public void onBillingChecked(boolean supported) {
// do nothing
if ( supported ) {
setAdFreeAction();
} else {
final Preference adFreePreference = findPreference(CalculatorApplication.AD_FREE_P_KEY);
adFreePreference.setEnabled(false);
Log.d(CalculatorPreferencesActivity.class.getName(), "Billing is not supported!");
}
}
@Override