rhodes 2.2.1 → 2.2.2.beta.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+## 2.2.2
+* #5822056 - bad login locks up the app
+
 ## 2.2.1
 * #5681741 - Android push: support alert,sync,sound,vibrate commands
 

data/lib/framework/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.2.1'
+    VERSION = '2.2.2'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '2.2.1'
+    DBVERSION = '2.2.2'
   end
   
 end

data/lib/framework/version.rb

@@ -1,8 +1,8 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '2.2.1'
+    VERSION = '2.2.2'
   end
   unless defined? RhodesFramework::DBVERSION
-    DBVERSION = '2.2.1'
+    DBVERSION = '2.2.2'
   end
 end

data/lib/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.2.1'
+    VERSION = '2.2.2'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '2.2.1'
+    DBVERSION = '2.2.2'
   end
   
 end

data/platform/android/Rhodes/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.rhomobile.rhodes"
-      android:versionCode="23"
-      android:versionName="2.2.1">
+      android:versionCode="24"
+      android:versionName="2.2.2">
     <uses-sdk android:minSdkVersion="3" />
     <application android:icon="@drawable/icon"
           android:multiprocess="true"

data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java

@@ -896,7 +896,6 @@ public class SyncEngine implements NetRequest.IRhoSession
 	
 	public void logout()throws Exception
 	{
-	    m_bStopByUser = true;
 	    if(m_NetRequest!=null) 
 	        m_NetRequest.cancel();
 		

data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java

@@ -584,6 +584,7 @@ public class SyncThread extends RhoThread
 
 					try{
 						stopSync();
+						getSyncEngine().stopSyncByUser();
 					    getSyncEngine().logout();
 					}catch(Exception e)
 					{

data/platform/iphone/Info.plist

@@ -27,7 +27,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.1</string>
+	<string>2.2.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 </dict>

data/platform/shared/sync/SyncEngine.cpp

@@ -784,7 +784,6 @@ String CSyncEngine::loadSession()
 
 void CSyncEngine::logout()
 {
-    m_bStopByUser = true;
     if(m_NetRequest) 
         m_NetRequest->cancel();
 

data/platform/shared/sync/SyncThread.cpp

@@ -316,6 +316,7 @@ void rho_sync_logout()
     rho_sync_stop();
 
 	//CDBAdapter& db = CDBAdapter::getUserDB();
+    CSyncThread::getSyncEngine().stopSyncByUser();
     CSyncThread::getSyncEngine().logout();
 }
 

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = '2.2.1'
+  s.version = '2.2.2.beta.1'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 62196433
+  prerelease: true
   segments: 
   - 2
   - 2
+  - 2
+  - beta
   - 1
-  version: 2.2.1
+  version: 2.2.2.beta.1
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 -07:00
+date: 2010-10-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency