Added support of OpenIAB from Yandex.

Corrected panorama focus. Corrected default focus. Corrections for nexus in noght.
Tinyriver · Mar 12, 2014 · da73fc4 · da73fc4
1 parent 2e9b315
commit da73fc4
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 2,310 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -11,7 +11,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	  package="com.almalence.opencam"
       android:installLocation="auto"
-      android:versionCode="54"
+      android:versionCode="55"
       android:versionName="3.17">
 <!--  -+- -->
 
@@ -97,6 +97,7 @@
 	<uses-permission android:name="android.permission.WRITE_SETTINGS" />
 <!-- -+-  -->
 	<uses-permission android:name="com.android.vending.BILLING"/>
+	<uses-permission android:name="org.onepf.openiab.permission.BILLING"/>
 <!--  -+- -->
 
 	<uses-sdk 	android:minSdkVersion="14"

diff --git a/jni/dro/Android.mk b/jni/dro/Android.mk
@@ -9,7 +9,7 @@ LOCAL_LDLIBS := -ldl -lz -llog
 
 include $(BUILD_SHARED_LIBRARY)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := gbufferlib
-LOCAL_SRC_FILES := ../prebuilt/$(TARGET_ARCH_ABI)/libgbuffer.so
-include $(PREBUILT_SHARED_LIBRARY)
+#include $(CLEAR_VARS)
+#LOCAL_MODULE := gbufferlib
+#LOCAL_SRC_FILES := ../prebuilt/$(TARGET_ARCH_ABI)/libgbuffer.so
+#include $(PREBUILT_SHARED_LIBRARY)
diff --git a/jni/dro/gbuffer.h b/jni/dro/gbuffer.h
diff --git a/jni/prebuilt/armeabi-v7a/libgbuffer.so b/jni/prebuilt/armeabi-v7a/libgbuffer.so
diff --git a/res/layout/plugin_capture_standard_modeswitcher.xml b/res/layout/plugin_capture_standard_modeswitcher.xml
@@ -26,14 +26,14 @@
         android:layout_marginTop="20dip"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"        
-        app:textOn="Hi-Res"
-        app:textOff="Hi-Speed"
+        app:textOn="DRO On"
+        app:textOff="DRO off"
         app:thumbTextPadding="3dp"
         app:switchMinWidth="@dimen/nightmodeswitcher_width"
         app:switchMinHeight="@dimen/nightmodeswitcher_height"
         app:switchPadding="4dp"
         app:switchTextAppearance="@style/TextAppearance"
-        app:thumb="@drawable/switch_inner_holo_dark"
+        app:thumb="@drawable/switch_inner_holo_dark_dro"
         app:track="@drawable/switch_track_holo_dark"
-        android:id="@+id/switch_nightmode"/>
+        android:id="@+id/switch_dromode"/>
 +++ -->
diff --git a/src/com/almalence/opencam/MainScreen.java b/src/com/almalence/opencam/MainScreen.java
@@ -29,9 +29,11 @@ Portions created by Initial Developer are Copyright (C) 2013
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStreamWriter;
+//import java.io.OutputStreamWriter;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -83,14 +85,16 @@ Portions created by Initial Developer are Copyright (C) 2013
 import com.almalence.util.Util;
 
 //<!-- -+-
-import com.almalence.opencam.billing.IabHelper;
-import com.almalence.opencam.billing.IabResult;
-import com.almalence.opencam.billing.Inventory;
-import com.almalence.opencam.billing.Purchase;
 import com.almalence.opencam.ui.AlmalenceGUI;
 import com.almalence.opencam.ui.GLLayer;
 import com.almalence.opencam.ui.GUI;
 import com.almalence.util.AppRater;
+
+import org.onepf.oms.OpenIabHelper;
+import org.onepf.oms.appstore.googleUtils.IabHelper;
+import org.onepf.oms.appstore.googleUtils.IabResult;
+import org.onepf.oms.appstore.googleUtils.Inventory;
+import org.onepf.oms.appstore.googleUtils.Purchase;
 //-+- -->
 /* <!-- +++
 import com.almalence.opencam_plus.ui.AlmalenceGUI;
@@ -2079,7 +2083,7 @@ public void setScreenBrightness(boolean setMax)
 	/*******************************************************/
 	/************************ Billing ************************/
 // <!-- -+-
-	IabHelper mHelper;
+	OpenIabHelper mHelper;
 
 	private boolean bOnSale = false;
 
@@ -2117,7 +2121,9 @@ private void createBillingHandler()
 			// Create the helper, passing it our context and the public key to
 			// verify signatures with
 			Log.v("Main billing", "Creating IAB helper.");
-			mHelper = new IabHelper(this, base64EncodedPublicKey);
+			Map<String, String> storeKeys = new HashMap<String, String>();
+	        storeKeys.put(OpenIabHelper.NAME_GOOGLE, base64EncodedPublicKey);
+			mHelper = new OpenIabHelper(this, storeKeys);
 
 			mHelper.enableDebugLogging(true);