rhodes 3.0.2 → 3.1.0.beta.1

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivityListener.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rhomobile.rhodes;
 
 import android.content.Intent;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivityStartupListeners.java

@@ -6,6 +6,7 @@ import com.rhomobile.rhodes.phonebook.ContactAccessor;
 class RhodesActivityStartupListeners {
 
 	public static final String[] ourRunnableList = { ""
+       ,"com.rhomobile.nfc.Nfc"
 	};
 
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rhomobile.rhodes;
 
 public class RhodesAppOptions {

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rhomobile.rhodes;
 
 import java.util.Collection;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rhomobile.rhodes;
 
 import java.io.File;
@@ -24,6 +50,7 @@ import com.rhomobile.rhodes.event.EventStore;
 import com.rhomobile.rhodes.file.RhoFileApi;
 import com.rhomobile.rhodes.geolocation.GeoLocation;
 import com.rhomobile.rhodes.mainview.MainView;
+import com.rhomobile.rhodes.mainview.SplashScreen;
 import com.rhomobile.rhodes.ui.AboutDialog;
 import com.rhomobile.rhodes.ui.LogOptionsDialog;
 import com.rhomobile.rhodes.ui.LogViewDialog;
@@ -35,6 +62,10 @@ import com.rhomobile.rhodes.uri.TelUriHandler;
 import com.rhomobile.rhodes.uri.UriHandler;
 import com.rhomobile.rhodes.uri.VideoUriHandler;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
+import com.rhomobile.rhodes.util.PhoneId;
+import com.rhomobile.rhodes.util.Utils;
+import com.rhomobile.rhodes.util.Utils.AssetsSource;
+import com.rhomobile.rhodes.util.Utils.FileSource;
 
 import android.app.AlertDialog;
 import android.app.Notification;
@@ -136,11 +167,6 @@ public class RhodesService extends Service {
 		return mGeoLocationInactivityTimeout;
 	}
 	
-	private RhoLogConf m_rhoLogConf = new RhoLogConf();
-	public RhoLogConf getLogConf() {
-		return m_rhoLogConf;
-	}
-	
 	private boolean mNeedGeoLocationRestart = false;
 	
 	class PowerWakeLock {
@@ -234,7 +260,6 @@ public class RhodesService extends Service {
 	public static native void navigateBack();
 	
 	private String mRootPath;
-	private native void nativeInitPath(String rootPath, String sqliteJournalsPath, String apkPath);
 	
 	public static native void onScreenOrientationChanged(int width, int height, int angle);
 	
@@ -252,36 +277,20 @@ public class RhodesService extends Service {
 	
 	public static native boolean isTitleEnabled();
 	
-	
-    // TODO: Move these methods to RhodesApplication class
-	private void initRootPath() {
-		ApplicationInfo appInfo = getAppInfo();
-		String dataDir = appInfo.dataDir;
-		
-		mRootPath = dataDir + "/rhodata/";
-		Log.d(TAG, "Root path: " + mRootPath);
-		
-		String sqliteJournalsPath = dataDir + "/sqlite_stmt_journals/";
-		Log.d(TAG, "Sqlite journals path: " + sqliteJournalsPath);
-		
-		File f = new File(mRootPath);
-		f.mkdirs();
-		f = new File(f, "db/db-files");
-		f.mkdirs();
-		f = new File(sqliteJournalsPath);
-		f.mkdirs();
-		f = new File(mRootPath, "tmp");
-		f.mkdirs();
-		
-		String apkPath = appInfo.sourceDir;
-		
-		nativeInitPath(mRootPath, sqliteJournalsPath, apkPath);
+	private static final String CONF_PHONE_ID = "phone_id";
+	private PhoneId getPhoneId() {
+	    String strPhoneId = RhoConf.getString(CONF_PHONE_ID);
+	    PhoneId phoneId = PhoneId.getId(this, strPhoneId);
+	    if (strPhoneId == null || strPhoneId.length() == 0)
+	        RhoConf.setString(CONF_PHONE_ID, phoneId.toString());
+
+	    return phoneId;
 	}
 	
 	public String getRootPath() {
-		return mRootPath;
-	}
-	
+	    return mRootPath;
+    }
+
     // TODO: Move these methods to RhodesApplication class
 	private ApplicationInfo getAppInfo() {
 		Context context = this;
@@ -294,6 +303,20 @@ public class RhodesService extends Service {
 		}
 	}
 	
+	private boolean isAppHashChanged() {
+		try {
+			File hash = new File(this.getRootPath(), "hash");
+			if (!hash.exists())
+				return true;
+			
+			FileSource as = new AssetsSource(this.getResources().getAssets());
+			FileSource fs = new FileSource();
+			return !Utils.isContentsEquals(as, "hash", fs, hash.getPath());
+		}
+		catch (IOException e) {
+			return true;
+		}
+	}
 	public class LocalBinder extends Binder {
 		RhodesService getService() {
 			return RhodesService.this;
@@ -321,16 +344,20 @@ public class RhodesService extends Service {
 		
 		initClassLoader(context.getClassLoader());
 		
+		ApplicationInfo appInfo = getAppInfo();
+
+		Log.d(TAG, "Root path: " + mRootPath);
+
 		try {
-			initRootPath();
-			RhoFileApi.init();
+			mRootPath = RhoFileApi.initRootPath(appInfo.dataDir, appInfo.sourceDir);
+			RhoFileApi.init(this);
 		} catch (IOException e) {
 			Log.e(TAG, e.getMessage());
 			exit();
 			return;
 		}
 		
-		if (Utils.isAppHashChanged()) {
+		if (this.isAppHashChanged()) {
 			try {
 				Log.i(TAG, "Application hash was changed");
 				
@@ -345,8 +372,8 @@ public class RhodesService extends Service {
 				
 				LocalFileProvider.revokeUriPermissions(context);
 
-				initRootPath();
-				RhoFileApi.init();
+				mRootPath = RhoFileApi.initRootPath(appInfo.dataDir, appInfo.sourceDir);
+				RhoFileApi.init(this);
 				RhoFileApi.copy("hash");
 			} catch (IOException e) {
 				Log.e(TAG, e.getMessage());
@@ -816,6 +843,13 @@ public class RhodesService extends Service {
 			else if (name.equalsIgnoreCase("has_calendar")) {
 				return new Boolean(EventStore.hasCalendar());
 			}
+			else if (name.equalsIgnoreCase("phone_id")) {
+			    PhoneId phoneId = RhodesService.getInstance().getPhoneId();
+			    return phoneId.toString();
+			}
+			else if (name.equalsIgnoreCase("webview_framework")) {
+				return "WEBKIT/" + Build.VERSION.RELEASE;
+			}
 		}
 		catch (Exception e) {
 			Logger.E(TAG, "Can't get property \"" + name + "\": " + e);
@@ -1171,6 +1205,14 @@ public class RhodesService extends Service {
 			return;
 		}
 
+        String phoneId = extras.getString("phone_id");
+        if (phoneId != null && phoneId.length() > 0 &&
+                !phoneId.equals(this.getPhoneId().toString())) {
+            Logger.W(TAG, "Push message for another phone_id: " + phoneId);
+            Logger.W(TAG, "Current phone_id: " + this.getPhoneId().toString());
+            return;
+        }
+
         StringBuilder builder = new StringBuilder();
         Set<String> keys = extras.keySet();
 
@@ -1181,6 +1223,9 @@ public class RhodesService extends Service {
                 continue;
             if(key.equals("collapse_key"))
                 continue;
+            if(key.equals("phone_id")) {
+                continue;
+            }
 
             Logger.D(TAG, "PUSH item: " + key);
             Object value = extras.get(key);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java

@@ -1,23 +1,29 @@
-/*
- ============================================================================
- Author	    : Dmitry Moskalchuk
- Version	: 1.5
- Copyright  : Copyright (C) 2008 Rhomobile. All rights reserved.
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
 
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ============================================================================
- */
 package com.rhomobile.rhodes;
 
 import java.util.HashMap;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java

@@ -1,23 +1,29 @@
-/*
- ============================================================================
- Author	    : Dmitry Moskalchuk
- Version	: 1.5
- Copyright  : Copyright (C) 2008 Rhomobile. All rights reserved.
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
 
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ============================================================================
- */
 package com.rhomobile.rhodes;
 
 import com.rhomobile.rhodes.util.PerformOnUiThread;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java

@@ -1,23 +1,29 @@
-/*
- ============================================================================
- Author	    : Dmitry Moskalchuk
- Version	: 1.5
- Copyright  : Copyright (C) 2008 Rhomobile. All rights reserved.
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
 
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ============================================================================
- */
 package com.rhomobile.rhodes.alert;
 
 import android.content.Context;