Cleanup Manifest files. fixes #427 #426

onepf · Jan 12, 2015 · 2534fdd · 2534fdd
1 parent 399484e
commit 2534fdd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -29,14 +29,4 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="com.tmoney.vending.INBILLING" />
-    <uses-permission android:name="com.sec.android.iap.permission.BILLING" />
-    <uses-permission android:name="org.onepf.openiab.permission.BILLING" />
-
-    <permission android:name="com.tmoney.vending.INBILLING" />
-
-    <meta-data
-        android:name="iap:api_version"
-        android:value="13" />
-
 </manifest>
diff --git a/samples/trivialdrive/build.gradle b/samples/trivialdrive/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
         versionCode 20
-        versionName '0.9.8'
+        versionName '0.9.8.2'
 
         applicationId 'org.onepf.sample.trivialdrive'
     }

diff --git a/samples/trivialdrive/src/main/AndroidManifest.xml b/samples/trivialdrive/src/main/AndroidManifest.xml
@@ -21,14 +21,24 @@
         android:name="android.hardware.telephony"
         android:required="false" />
 
-    <uses-permission android:name="com.android.vending.BILLING" />
-    <uses-permission android:name="com.nokia.payment.BILLING" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="com.tmoney.vending.INBILLING" />
-    <uses-permission android:name="com.sec.android.iap.permission.BILLING" />
+
+    <!--Open Stores-->
     <uses-permission android:name="org.onepf.openiab.permission.BILLING" />
+    <!--Google-->
+    <uses-permission android:name="com.android.vending.BILLING" />
+    <!--Nokia-->
+    <uses-permission android:name="com.nokia.payment.BILLING" />
+    <!--Samsung-->
+    <uses-permission android:name="com.sec.android.iap.permission.BILLING" />
+    <!--Fortumo-->
+    <uses-permission android:name="android.permission.RECEIVE_SMS" />
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <!--SlideME-->
     <uses-permission android:name="com.slideme.sam.manager.inapp.permission.BILLING" />
+    <!--Skubit-->
     <uses-permission android:name="com.skubit.BILLING" />
 
     <application
@@ -52,13 +62,15 @@
             </intent-filter>
         </activity>
 
+        <!--Amazon start-->
         <receiver android:name="com.amazon.device.iap.ResponseReceiver">
             <intent-filter>
                 <action
                     android:name="com.amazon.inapp.purchasing.NOTIFY"
                     android:permission="com.amazon.inapp.purchasing.Permission.NOTIFY" />
             </intent-filter>
         </receiver>
+        <!--Amazon end-->
 
         <!--Fortumo start-->
         <receiver android:name="mp.MpSMSReceiver">