Fix donation + Add proguard + add library name

.gitignore

@@ -6,7 +6,8 @@
 target/*
 target/*.pom
 target/*.asc
-
+*/proguard/*
+
 # OS Files #
 .DS_Store
 

library/pom.xml

@@ -62,6 +62,7 @@
 
 	</dependencies>
 	<build>
+		<finalName>emv-paycard-library-${project.version}</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.eluder.coveralls</groupId>

pom.xml

@@ -155,13 +155,19 @@
 								<skip>${sign.skip}</skip>
 								<removeExistingSignatures>true</removeExistingSignatures>
 								<archiveDirectory />
+								<excludes>
+									<exclude>${project.build.directory}/*.apk</exclude>
+									<exclude>${project.build.directory}/*.jar</exclude>
+								</excludes>
 								<includes>
-									<include>${project.build.directory}/${project.artifactId}.apk</include>
+									<include>${project.build.directory}/sample-signed-aligned.apk</include>
 								</includes>
 								<keystore>${sign.keystore}</keystore>
 								<alias>${sign.alias}</alias>
 								<storepass>${sign.storepass}</storepass>
 								<keypass>${sign.keypass}</keypass>
+								<argument>-sigalg</argument><argument>MD5withRSA</argument>
+								<argument>-digestalg</argument><argument>SHA1</argument>
 								<verbose>true</verbose>
 							</configuration>
 						</execution>

sample/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.github.devnied.emvnfccard"
-    android:versionCode="24"
-    android:versionName="2.1.5" >
+    android:versionCode="27"
+    android:versionName="2.1.8" >
 
     <uses-sdk
         android:minSdkVersion="15"

sample/project.properties

@@ -7,8 +7,8 @@
 # "ant.properties", and override values to adapt the script to your
 # project structure.
 #
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home)
+proguard.config=proguard.cfg
 
 # Project target.
 target=Google Inc.:Google APIs:19

sample/src/main/java/com/github/devnied/emvnfccard/activity/HomeActivity.java

@@ -165,12 +165,12 @@ public void onCreate(final Bundle savedInstanceState) {
 
 		// 2.1 create ActionBarDrawerToggle
 		mActionBarDrawerToggle = new ActionBarDrawerToggle(/* */
-		this, /* host Activity */
-		mDrawerLayout, /* DrawerLayout object */
-		R.drawable.ic_drawer, /* nav drawer icon to replace 'Up' caret */
-		R.string.navigation_menu_open, /* "open drawer" description */
-		R.string.navigation_menu_close /* "close drawer" description */
-		);
+				this, /* host Activity */
+				mDrawerLayout, /* DrawerLayout object */
+				R.drawable.ic_drawer, /* nav drawer icon to replace 'Up' caret */
+				R.string.navigation_menu_open, /* "open drawer" description */
+				R.string.navigation_menu_close /* "close drawer" description */
+				);
 
 		// 2.2 Set actionBarDrawerToggle as the DrawerListener
 		mDrawerLayout.setDrawerListener(mActionBarDrawerToggle);
@@ -330,7 +330,7 @@ protected void onPostExecute(final Object result) {
 						}
 					} else {
 						CroutonUtils
-								.display(HomeActivity.this, getResources().getText(R.string.error_communication_nfc), CoutonColor.BLACK);
+						.display(HomeActivity.this, getResources().getText(R.string.error_communication_nfc), CoutonColor.BLACK);
 					}
 
 					refreshContent();
@@ -485,9 +485,12 @@ public void onItemClick(final AdapterView<?> parent, final View view, final int
 	@Override
 	public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
 		if (mLastSelectedMenu == ConstantUtils.ABOUT) {
-			Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.about_inapp_content);
+			Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.content_frame);
 			if (fragment != null) {
-				((BillingFragment) fragment).onActivityResult(requestCode, resultCode, data);
+				BillingFragment billing = (BillingFragment) fragment.getChildFragmentManager().findFragmentById(R.id.about_inapp_content);
+				if (billing != null) {
+					billing.onActivityResult(requestCode, resultCode, data);
+				}
 			}
 		}
 	}

sample/src/main/java/com/github/devnied/emvnfccard/fragment/BillingFragment.java

@@ -117,7 +117,7 @@ protected void onPreExecute() {
 				protected void doInBackground() {
 					Bundle querySkus = new Bundle();
 					ArrayList<String> itemId = new ArrayList<String>();
-					for (int i = 0; i < 10; i++) {
+					for (int i = 0; i < 5; i++) {
 						itemId.add("donate_" + i);
 					}
 					try {