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

res/layout/admob_pref.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2009-2012. Created by serso aka se.solovyev.
+  ~ For more information, please, contact se.solovyev@gmail.com
+  ~ or visit http://se.solovyev.org
+  -->
+
+<LinearLayout
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent" android:orientation="vertical">
+</LinearLayout>

res/layout/help_faq.xml

@@ -6,19 +6,26 @@
   ~ or visit http://se.solovyev.org
   -->
 
-
 <ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
 			a:layout_width="fill_parent"
 			a:layout_height="fill_parent">
 
-	<TextView
+	<LinearLayout
-			a:text="@string/c_faq_content"
+			a:orientation="vertical"
+			a:id="@+id/ad_parent_view"
 			a:layout_width="fill_parent"
-			a:layout_height="fill_parent"
+			a:layout_height="fill_parent">
-			a:gravity="top|left"
+
-			a:layout_weight="1"
+		<TextView
-			a:scrollbars="vertical"
+				a:text="@string/c_faq_content"
-			style="@style/about_style"/>
+				a:layout_width="fill_parent"
+				a:layout_height="fill_parent"
+				a:gravity="top|left"
+				a:layout_weight="1"
+				a:scrollbars="vertical"
+				style="@style/about_style"/>
+
+	</LinearLayout>
 
 </ScrollView>
 

res/layout/help_hints.xml

@@ -9,12 +9,19 @@
 			a:layout_width="fill_parent"
 			a:layout_height="fill_parent">
 
-	<TextView
+	<LinearLayout
-			xmlns:a="http://schemas.android.com/apk/res/android"
+			a:orientation="vertical"
-			a:text="@string/c_hints_content"
+			a:id="@+id/ad_parent_view"
-			a:gravity="top|left"
+			a:layout_width="fill_parent"
-			a:layout_weight="1"
+			a:layout_height="fill_parent">
-			a:scrollbars="vertical"
+
-			style="@style/about_style"/>
+		<TextView
+				xmlns:a="http://schemas.android.com/apk/res/android"
+				a:text="@string/c_hints_content"
+				a:gravity="top|left"
+				a:layout_weight="1"
+				a:scrollbars="vertical"
+				style="@style/about_style"/>
+	</LinearLayout>
 
 </ScrollView>

res/layout/help_screens.xml

@@ -9,12 +9,20 @@
 			a:layout_width="fill_parent"
 			a:layout_height="fill_parent">
 
-	<TextView
+	<LinearLayout
-			xmlns:a="http://schemas.android.com/apk/res/android"
+			a:orientation="vertical"
-			a:text="@string/c_screens_content"
+			a:id="@+id/ad_parent_view"
-			a:gravity="top|left"
+			a:layout_width="fill_parent"
-			a:layout_weight="1"
+			a:layout_height="fill_parent">
-			a:scrollbars="vertical"
+
-			style="@style/about_style"/>
+		<TextView
+				xmlns:a="http://schemas.android.com/apk/res/android"
+				a:text="@string/c_screens_content"
+				a:gravity="top|left"
+				a:layout_weight="1"
+				a:scrollbars="vertical"
+				style="@style/about_style"/>
+
+	</LinearLayout>
 
 </ScrollView>

res/xml/main_preferences.xml

@@ -12,6 +12,10 @@
 
 	<PreferenceCategory a:title="@string/c_prefs_calculations_category">
 
+		<org.solovyev.android.view.prefs.AdViewPreference
+			 a:key="admob_01"
+			 a:layout="@layout/admob_pref"/>
+
 		<android.preference.CheckBoxPreference
 				a:key="@string/p_calc_round_result_key"
 				a:summary="@string/c_calc_round_result_summary"
@@ -54,6 +58,10 @@
 
 	<PreferenceCategory a:title="@string/c_prefs_appearance_category">
 
+		<org.solovyev.android.view.prefs.AdViewPreference
+			 a:key="admob_02"
+			 a:layout="@layout/admob_pref"/>
+
 		<android.preference.CheckBoxPreference
 				a:key="@string/p_calc_color_display_key"
 				a:summary="@string/c_calc_color_display_summary"

src/main/java/org/solovyev/android/AndroidUtils.java

@@ -129,13 +129,14 @@ public final class AndroidUtils {
 	@NotNull
 	public static AdView createAndInflateAdView(@NotNull Activity activity,
 												@NotNull String admobAccountId,
+												@Nullable ViewGroup parentView,
 												int layoutId,
 												@NotNull List<String> keywords) {
+		final ViewGroup layout = parentView != null ? parentView : (ViewGroup) activity.findViewById(layoutId);
+
 		// Create the adView
 		final AdView adView = new AdView(activity, AdSize.BANNER, admobAccountId);
 
-		final ViewGroup layout = (ViewGroup) activity.findViewById(layoutId);
-
 		// Add the adView to it
 		layout.addView(adView);
 
@@ -184,5 +185,23 @@ public final class AndroidUtils {
 		void process(@NotNull V view);
 	}
 
+	public static void restartActivity(@NotNull Activity activity) {
+		final Intent intent = activity.getIntent();
+		/*
+		for compatibility with android_1.6_compatibility
+		overridePendingTransition(0, 0);
+		intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);*/
+
+		Log.d(activity.getClass().getName(), "Finishing current activity!");
+		activity.finish();
+
+		/*
+		for compatibility with android_1.6_compatibility
+
+		overridePendingTransition(0, 0);*/
+		Log.d(activity.getClass().getName(), "Starting new activity!");
+		activity.startActivity(intent);
+	}
+
 }
 

src/main/java/org/solovyev/android/calculator/CalculatorActivity.java

@@ -599,24 +599,6 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
 		view.setTextSize(TypedValue.COMPLEX_UNIT_PX, fontPixelSize * ratio);
 	}
 
-	public void restart() {
-		final Intent intent = getIntent();
-		/*
-		for compatibility with android_1.6_compatibility
-		overridePendingTransition(0, 0);
-		intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);*/
-
-		Log.d(this.getClass().getName(), "Finishing current activity!");
-		finish();
-
-		/*
-		for compatibility with android_1.6_compatibility
-
-		overridePendingTransition(0, 0);*/
-		Log.d(this.getClass().getName(), "Starting new activity!");
-		startActivity(intent);
-	}
-
 	@Override
 	protected void onResume() {
 		super.onResume();
@@ -626,7 +608,7 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
 		final String newLayoutName = preferences.getString(getString(R.string.p_calc_layout_key), getString(R.string.p_calc_layout));
 		final String newThemeName = preferences.getString(getString(R.string.p_calc_theme_key), getString(R.string.p_calc_theme));
 		if (!themeName.equals(newThemeName) || !layoutName.equals(newLayoutName)) {
-			restart();
+			AndroidUtils.restartActivity(this);
 		}
 
 		calculatorModel = CalculatorModel.instance.init(this, preferences, CalculatorEngine.instance);

src/main/java/org/solovyev/android/calculator/CalculatorApplication.java

@@ -3,6 +3,7 @@ package org.solovyev.android.calculator;
 import android.app.Activity;
 import android.content.Context;
 import android.util.Log;
+import android.view.ViewGroup;
 import com.google.ads.AdView;
 import net.robotmedia.billing.BillingController;
 import org.jetbrains.annotations.NotNull;
@@ -60,16 +61,16 @@ public class CalculatorApplication extends android.app.Application {
 
 	@Nullable
 	public static AdView inflateAd(@NotNull Activity activity) {
-		return inflateAd(activity, R.id.ad_parent_view);
+		return inflateAd(activity, null, R.id.ad_parent_view);
 	}
 
 	@Nullable
-	public static AdView inflateAd(@NotNull Activity activity, int parentViewId) {
+	public static AdView inflateAd(@NotNull Activity activity, @Nullable ViewGroup parentView, int parentViewId) {
 		AdView result = null;
 		if ( !isAdFree(activity) ) {
 			Log.d(activity.getClass().getName(), "Application is not ad free - inflating ad!");
 			final List<String> keywords = Collections.emptyList();
-			result = AndroidUtils.createAndInflateAdView(activity, ADMOB_USER_ID, parentViewId, keywords);
+			result = AndroidUtils.createAndInflateAdView(activity, ADMOB_USER_ID, parentView, parentViewId, keywords);
 		} else {
 			Log.d(activity.getClass().getName(), "Application is ad free - no ads!");
 		}

src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java

@@ -17,6 +17,7 @@ import net.robotmedia.billing.BillingController;
 import net.robotmedia.billing.BillingRequest;
 import net.robotmedia.billing.IBillingObserver;
 import net.robotmedia.billing.model.Transaction;
+import org.solovyev.android.AndroidUtils;
 import org.solovyev.android.calculator.model.CalculatorEngine;
 import org.solovyev.android.view.widgets.VibratorContainer;
 
@@ -135,17 +136,19 @@ public class CalculatorPreferencesActivity extends PreferenceActivity implements
 	@Override
 	public void onPurchaseStateChanged(String itemId, Transaction.PurchaseState state) {
 		if (CalculatorApplication.AD_FREE_PRODUCT_ID.equals(itemId)) {
-			final Preference addFreePreference = findPreference(CalculatorApplication.AD_FREE_P_KEY);
+			final Preference adFreePreference = findPreference(CalculatorApplication.AD_FREE_P_KEY);
-			if (addFreePreference != null) {
+			if (adFreePreference != null) {
 				switch (state) {
 					case PURCHASED:
-						addFreePreference.setEnabled(false);
+						adFreePreference.setEnabled(false);
+						// restart activity to disable ads
+						AndroidUtils.restartActivity(this);
 						break;
 					case CANCELLED:
-						addFreePreference.setEnabled(true);
+						adFreePreference.setEnabled(true);
 						break;
 					case REFUNDED:
-						addFreePreference.setEnabled(true);
+						adFreePreference.setEnabled(true);
 						break;
 				}
 			} else {

src/main/java/org/solovyev/android/calculator/help/AbstractHelpActivity.java

@@ -10,6 +10,7 @@ import android.app.Activity;
 import android.os.Bundle;
 import com.google.ads.AdView;
 import org.jetbrains.annotations.Nullable;
+import org.solovyev.android.calculator.CalculatorApplication;
 
 /**
  * User: serso
@@ -34,7 +35,7 @@ public class AbstractHelpActivity extends Activity {
 		setContentView(layoutId);
 
 		// do not inflate ad in help (as some problems were encountered dut to ScrollView - no space for ad banner)
-		//adView = CalculatorApplication.inflateAd(this);
+		adView = CalculatorApplication.inflateAd(this);
 	}
 
 	@Override

src/main/java/org/solovyev/android/view/prefs/AdViewPreference.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2009-2012. Created by serso aka se.solovyev.
+ * For more information, please, contact se.solovyev@gmail.com
+ * or visit http://se.solovyev.org
+ */
+
+package org.solovyev.android.view.prefs;
+
+import android.app.Activity;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import com.google.ads.AdView;
+import org.jetbrains.annotations.Nullable;
+import org.solovyev.android.calculator.CalculatorApplication;
+
+/**
+ * User: serso
+ * Date: 1/14/12
+ * Time: 6:47 PM
+ */
+public class AdViewPreference extends android.preference.Preference {
+
+	@Nullable
+	private AdView adView;
+
+	public AdViewPreference(Context context) {
+		super(context, null);
+	}
+
+	public AdViewPreference(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	@Override
+	protected View onCreateView(ViewGroup parent) {
+		// this will create the linear layout defined in ads_layout.xml
+		View view = super.onCreateView(parent);
+
+		if (view instanceof ViewGroup) {
+			adView = CalculatorApplication.inflateAd((Activity) getContext(), ((ViewGroup) view), 0);
+		}
+
+		return view;
+	}
+}