Merge branch 'EinsteinAtHome' into 'master'

This is meant not to break anything, just add some
(optional) logging and features needed for Einstein@Home.
Please contact me before changing or removing any of this.

Conflicts:
	sched/db_dump.cpp
	sched/file_deleter.cpp
	sched/validator.cpp

.gitignore

@@ -11,8 +11,18 @@
 
 # Installshield build directories
 /win_build/installerv2/BOINC
+/win_build/installerv2/BOINC_vbox
 /win_build/installerv2/BOINCx64
+/win_build/installerv2/BOINCx64_vbox
 /win_build/installerv2/WCG
+/win_build/installerv2/Progress
+
+# Visual Studio Build Directories for BOINCCAS
+/win_build/installerv2/redist/Windows/src/boinccas/Debug
+/win_build/installerv2/redist/Windows/src/boinccas/Debug95
+/win_build/installerv2/redist/Windows/src/boinccas/Release
+/win_build/installerv2/redist/Windows/src/boinccas/Release95
+/win_build/installerv2/redist/Windows/src/boinccas/x64
 
 #
 *.pfx
@@ -24,8 +34,9 @@
 *.la
 *.in
 /client/Makefile
-/win_build/installerv2/Progress
 /win_build/*.filters
 /win_build/boinc.sdf
 /win_build/boinc.opensdf
 /win_build/ipch
+/win_build/installerv2/redist/Windows/src/boinccas/*.filters
+/win_build/installerv2/redist/Windows/src/boinccas/boinccas.sdf

Makefile.am

@@ -13,6 +13,9 @@ if ENABLE_LIBRARIES
 if ENABLE_SERVER
     API_SUBDIRS += zip
 endif
+if ENABLE_BOINCZIP
+    API_SUBDIRS += zip
+endif
 endif
 
 if ENABLE_SERVER

Makefile.incl

@@ -1,6 +1,9 @@
 ## -*-Makefile -*-
 ## $Id$
 
+# For debugging purposes
+#AM_DEFAULT_VERBOSITY=1
+
 # Note: MYSQL_CFLAGS and MYSQL_LIBS set by configure from mysql_config
 
 # ignore any LIBS set by configure

android/BOINC/AndroidManifest.xml

@@ -20,8 +20,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="edu.berkeley.boinc"
     android:installLocation="internalOnly"
-    android:versionCode="54"
-    android:versionName="7.3.1" > <!-- installation on SD card would break boot receiver -->
+    android:versionCode="72"
+    android:versionName="7.3.19" > <!-- installation on SD card would break boot receiver -->
 
 
     <!-- Add Google Play store metadata informing the store we can run on tablets and other large screen devices -->
@@ -56,12 +56,12 @@
         <activity
             android:name="edu.berkeley.boinc.SplashActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="portrait"
             android:label="@string/app_name"
-            android:theme="@android:style/Theme.NoTitleBar"
+            android:theme="@style/Theme.Styled.NoActionBar"
             android:noHistory="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -71,30 +71,44 @@
             android:launchMode="singleTop"
             android:exported="true" >
         </activity>
-        <activity android:name="edu.berkeley.boinc.AttachProjectListActivity" >
+        <activity android:name="edu.berkeley.boinc.attach.AcctMgrFragment" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="edu.berkeley.boinc.BOINCActivity" />
         </activity>
-        <activity android:name="edu.berkeley.boinc.AttachProjectAcctMgrActivity" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="edu.berkeley.boinc.AttachProjectListActivity" />
+        <activity
+            android:name="edu.berkeley.boinc.attach.SelectionListActivity"
+            android:theme="@style/Theme.Styled.NoActionBar"
+            android:screenOrientation="portrait" >
         </activity>
         <activity
-            android:name="edu.berkeley.boinc.AttachProjectLoginActivity"
-            android:configChanges="orientation" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="edu.berkeley.boinc.AttachProjectListActivity" />
+            android:name="edu.berkeley.boinc.attach.CredentialInputActivity"
+            android:theme="@style/Theme.Styled.NoActionBar"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan" >
+        </activity>
+        <activity
+            android:name="edu.berkeley.boinc.attach.BatchProcessingActivity"
+            android:theme="@style/Theme.Styled.NoActionBar"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name="edu.berkeley.boinc.attach.BatchConflictListActivity"
+            android:theme="@style/Theme.Styled.NoActionBar"
+            android:screenOrientation="portrait" >
+        </activity>
+        <activity
+            android:name="edu.berkeley.boinc.attach.IndividualAttachActivity"
+            android:theme="@style/Theme.Styled.NoActionBar"
+            android:screenOrientation="portrait" >
         </activity>
-        <activity android:name="edu.berkeley.boinc.AttachProjectRegistrationActivity" >
+        <activity android:name="edu.berkeley.boinc.attach.AttachProjectRegistrationActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="edu.berkeley.boinc.AttachProjectListActivity" />
         </activity>
         <activity
-            android:name="edu.berkeley.boinc.AttachProjectWorkingActivity"
+     		android:name="edu.berkeley.boinc.attach.AttachProjectWorkingActivity"
             android:configChanges="orientation"
             android:noHistory="true" />
         <activity android:name="edu.berkeley.boinc.EventLogActivity" >
@@ -103,23 +117,29 @@
                 android:value="edu.berkeley.boinc.BOINCActivity" />
         </activity>
 
-        <service android:name="edu.berkeley.boinc.client.Monitor" >
+        <service android:name="edu.berkeley.boinc.client.Monitor" android:process=":remote">
+        </service>
+        <service android:name="edu.berkeley.boinc.attach.ProjectAttachService">
         </service>
 
         <receiver android:name="edu.berkeley.boinc.receiver.BootReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
+        <receiver android:name="edu.berkeley.boinc.receiver.PowerConnectedReceiver" >
+	        <intent-filter>
+	            <action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
+	        </intent-filter>
+        </receiver>
         <receiver android:name="edu.berkeley.boinc.receiver.PackageReplacedReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
-
-                <data
-                    android:path="edu.berkeley.boinc"
-                    android:scheme="package" />
+                <data android:path="edu.berkeley.boinc" android:scheme="package" />
             </intent-filter>
         </receiver>
+        <activity android:name=".BoincNotExclusiveDialog" android:theme="@android:style/Theme.Dialog">
+        </activity>
     </application>
 
 </manifest>