From: kenstir <kenstir@gmail.com>
Date: Thu, 13 Aug 2015 02:31:51 +0000 (-0400)
Subject: Fixed the issue that the Google Play Store sayd Supported devices 0.  This turned... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6d714f5ca40115ba5092dec57039181be1ea7a5f;p=working%2FEvergreen.git

Fixed the issue that the Google Play Store sayd Supported devices 0.  This turned out to be jars contained in the osrf jar being treated as requirements that no devices matched.  Included the json jar directly in the cwmars app, and removed the memcached jar and the java file requiring it.
---

diff --git a/Open-ILS/src/Android/core/core.iml b/Open-ILS/src/Android/core/core.iml
index 666c9b1525..11ca7f92c4 100644
--- a/Open-ILS/src/Android/core/core.iml
+++ b/Open-ILS/src/Android/core/core.iml
@@ -13,7 +13,7 @@
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="libs" level="project" />
     <orderEntry type="module" module-name="appcompat" exported="" />
diff --git a/Open-ILS/src/Android/core/libs/json-20090211.jar b/Open-ILS/src/Android/core/libs/json-20090211.jar
new file mode 100644
index 0000000000..ef29094093
Binary files /dev/null and b/Open-ILS/src/Android/core/libs/json-20090211.jar differ
diff --git a/Open-ILS/src/Android/core/libs/opensrf2_android.jar b/Open-ILS/src/Android/core/libs/opensrf2_android.jar
new file mode 100644
index 0000000000..0c91332338
Binary files /dev/null and b/Open-ILS/src/Android/core/libs/opensrf2_android.jar differ
diff --git a/Open-ILS/src/Android/core/libs/org.opensrf2_serialized_reg.jar b/Open-ILS/src/Android/core/libs/org.opensrf2_serialized_reg.jar
deleted file mode 100644
index 84c9b94883..0000000000
Binary files a/Open-ILS/src/Android/core/libs/org.opensrf2_serialized_reg.jar and /dev/null differ
diff --git a/Open-ILS/src/Android/core/res/drawable/evergreen_1_512x512x32_color.png b/Open-ILS/src/Android/core/res/drawable/evergreen_1_512x512x32_color.png
new file mode 100644
index 0000000000..f2f6d80479
Binary files /dev/null and b/Open-ILS/src/Android/core/res/drawable/evergreen_1_512x512x32_color.png differ
diff --git a/Open-ILS/src/Android/cwmars_app/.idea/libraries/dexedLibs.xml b/Open-ILS/src/Android/cwmars_app/.idea/libraries/dexedLibs.xml
deleted file mode 100644
index a8a26321ec..0000000000
--- a/Open-ILS/src/Android/cwmars_app/.idea/libraries/dexedLibs.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="dexedLibs">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../core/bin/dexedLibs/androwrapee-1.1.0-e1a06f0b15feb57f60fc050388c60c69.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../core/bin/dexedLibs/org.opensrf2_serialized_reg-5dba35be916c7a72e45ee4bb4a6478a8.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../core/bin/dexedLibs/zxing_barcode-7de1bcf4a56bfb1068e055d26c0a58d6.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/cwmars_app/.idea/libraries/libs.xml b/Open-ILS/src/Android/cwmars_app/.idea/libraries/libs.xml
index b59422db8c..2c6670d38c 100644
--- a/Open-ILS/src/Android/cwmars_app/.idea/libraries/libs.xml
+++ b/Open-ILS/src/Android/cwmars_app/.idea/libraries/libs.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="libs">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../core/libs/org.opensrf2_serialized_reg.jar!/" />
       <root url="jar://$PROJECT_DIR$/../core/libs/zxing_barcode.jar!/" />
       <root url="jar://$PROJECT_DIR$/../core/libs/androwrapee-1.1.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../core/libs/opensrf2_android.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
index 1635c321ef..445017ff10 100644
--- a/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
+++ b/Open-ILS/src/Android/cwmars_app/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.cwmars"
           android:installLocation="auto"
-          android:versionCode="1"
+          android:versionCode="3"
           android:versionName="1.0">
 
     <uses-sdk
@@ -11,18 +11,14 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <!--<uses-permission android:name="android.permission.CAMERA" />-->
-    <!--<uses-permission android:name="android.permission.FLASHLIGHT" />-->
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <!--<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />-->
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <!--<uses-permission android:name="android.permission.VIBRATE" />-->
-    <!--<uses-permission android:name="android.permission.WAKE_LOCK" />-->
 
-    <!--<uses-feature android:name="android.hardware.camera" />-->
-    <!--<uses-feature android:name="android.hardware.camera.autofocus" />-->
+    <uses-feature android:name="android.hardware.screen.landscape" android:required="false" />
+    <uses-feature android:name="android.hardware.screen.portrait" android:required="false" />
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
 
     <application
         android:allowBackup="true"
@@ -36,6 +32,7 @@
             android:process=":remote" >
         </receiver>
         <!-- Receiver to reinit notifications on reboot -->
+        <!--
         <receiver android:name="org.evergreen_ils.services.RebootReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -46,9 +43,12 @@
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
             </intent-filter>
         </receiver>
+        -->
 
+        <!--
         <service android:name="org.evergreen_ils.services.ScheduledIntentService" >
         </service>
+        -->
 
         <activity
                 android:name="org.evergreen_ils.views.splashscreen.SplashActivity"
diff --git a/Open-ILS/src/Android/demo_app/.idea/copyright/profiles_settings.xml b/Open-ILS/src/Android/demo_app/.idea/copyright/profiles_settings.xml
index 3572571ad8..e7bedf3377 100644
--- a/Open-ILS/src/Android/demo_app/.idea/copyright/profiles_settings.xml
+++ b/Open-ILS/src/Android/demo_app/.idea/copyright/profiles_settings.xml
@@ -1,5 +1,3 @@
 <component name="CopyrightManager">
-  <settings default="">
-    <module2copyright />
-  </settings>
+  <settings default="" />
 </component>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/support/v7/appcompat/appcompat.iml b/Open-ILS/src/Android/support/v7/appcompat/appcompat.iml
index f3fb8116ff..6fa91bc290 100644
--- a/Open-ILS/src/Android/support/v7/appcompat/appcompat.iml
+++ b/Open-ILS/src/Android/support/v7/appcompat/appcompat.iml
@@ -12,7 +12,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library" exported="">
       <library>