Permalink
Browse files

Merge branch 'master' of https://github.com/kvj/mobileorg-android

  • Loading branch information...
kvj committed Jan 10, 2012
2 parents 152effa + 033e575 commit d36cb1226db60d96e02f450ef3a97086a9891d1c
Showing with 4 additions and 2 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 AndroidManifest.xml
  3. +2 −1 src/com/matburt/mobileorg/ng/service/DataService.java
View
@@ -7,3 +7,4 @@ matburt-key.keystore
dbprivate.xml
eproject.cfg
Thumbs.db
+res/values/dropbox.xml
View
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.matburt.mobileorg.ng"
- android:versionCode="1"
+ android:versionCode="2"
android:versionName="0.0.1" >
<uses-sdk
@@ -83,7 +83,8 @@ public int onStartCommand(Intent intent, int flags, int startId) {
}
Log.i(TAG, "Handle intent: " + message);
if ("sync".equals(message)
- || "com.matburt.mobileorg.ng.SYNC".equals(intent.getAction())) {
+ || (null != intent && "com.matburt.mobileorg.ng.SYNC"
+ .equals(intent.getAction()))) {
try {
powerLock(this);
new Thread() {

0 comments on commit d36cb12

Please sign in to comment.