rhodes 2.2.4.beta.1 → 2.2.5.beta.1

data/lib/framework/rho/rhoevent_c.rb

@@ -6,7 +6,11 @@ module Rho
     def self.find(*args)
       if args.first == :all
         params = {}
-        params = args[1] if args.length >= 2 and args[1].is_a? Hash
+        if args.length >= 2 and args[1].is_a? Hash
+          args[1].each do |k,v|
+            params[k.to_s] = v
+          end
+        end
 
         params['start_date'] = MIN_TIME if params['start_date'].nil? or params['start_date'] < MIN_TIME
         params['end_date'] = MAX_TIME if params['end_date'].nil? or params['end_date'] > MAX_TIME
@@ -30,6 +34,7 @@ module Rho
     end
 
     def self.create!(event)
+      event['id'] = nil #indicate that event should be created
       Rho::Calendar.save(event)
     end
 

data/lib/framework/rho/rhosupport.rb

@@ -79,7 +79,7 @@ module Rho
           params.merge!(parse_query_parameters(req['request-query']))				
         end
         unless req['headers'].nil? or req['headers']['Content-Type'].nil?
-          if 'application/x-www-form-urlencoded'.eql? req['headers']['Content-Type']
+          unless req['headers']['Content-Type'].index('application/x-www-form-urlencoded').nil?
             params.merge!(parse_query_parameters(req['request-body']))
           end	
         end

data/lib/framework/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.2.4'
+    VERSION = '2.2.5'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/lib/framework/rholang/rhomsg_de.rb

@@ -15,7 +15,7 @@ module Rho
 	  'log_menu' => "Log",
 	  'close_menu' => "Close",
       'get_link_menu' => "Link abrufen",
-      'open_link_menu' => "Open Link",
+      'open_link_menu' => "Link öffnen",
       'email_menu' => "Email",
       'call_menu' => "Call",
       'sms_menu' => "SMS",

data/lib/framework/rholang/rhomsg_es.rb

@@ -15,7 +15,7 @@ module Rho
 	  'log_menu' => "Log",
 	  'close_menu' => "Cerrar",
       'get_link_menu' => "Obtener vínculo",
-      'open_link_menu' => "Obtener vínculo",
+      'open_link_menu' => "Abrir vínculo",
       'email_menu' => "Email",
       'call_menu' => "Llamar",
       'sms_menu' => "SMS",

data/lib/framework/rholang/rhomsg_it.rb

@@ -0,0 +1,28 @@
+module Rho
+  class RhoMessages
+    LocalMessages = {
+      'sync_failed_for' => "Sync failed for ",
+      'details'         => " Details: ",
+      'sync_completed'  => "Sync completed.",
+      'syncronizing'    => "Synchronizing ",
+      'syncronizing_data' => "Synchronizing data...",
+      
+	  'home_menu' => "Home",
+	  'refresh_menu' => "Refresh",
+	  'back_menu' => "Back",
+	  'sync_menu' => "Sync",
+	  'options_menu' => "Options",
+	  'log_menu' => "Log",
+	  'close_menu' => "Close",
+      'get_link_menu' => "Apri collegamento",
+      'open_link_menu' => "Apri collegamento",
+      'email_menu' => "Email",
+      'call_menu' => "Call",
+      'sms_menu' => "SMS",
+      'add_contacts_menu' => "Add to Contacts",
+      
+      'hide' => 'Hide'
+    }
+    
+  end # RhoMessages
+end # Rho

data/lib/framework/rhom/rhom.rb

@@ -42,6 +42,7 @@ module Rhom
       end
 
       def database_client_reset
+        old_interval = SyncEngine.set_pollinterval(0)
         SyncEngine.stop_sync
         
         params = ["", "", 0]
@@ -59,9 +60,12 @@ module Rhom
       
         hash_migrate = {}
         ::Rho::RHO.init_schema_sources(hash_migrate) 
+        
+        SyncEngine.set_pollinterval(old_interval)
       end
       
       def database_full_reset(reset_client_info=false)
+        old_interval = SyncEngine.set_pollinterval(0)
         SyncEngine.stop_sync
         
         ::Rho::RHO.get_user_db().execute_sql("UPDATE client_info SET reset=1")
@@ -77,6 +81,8 @@ module Rhom
       
         hash_migrate = {}
         ::Rho::RHO.init_schema_sources(hash_migrate) 
+        
+        SyncEngine.set_pollinterval(old_interval)
       end
       
       def database_full_reset_and_logout

data/lib/framework/rhom/rhom_model.rb

@@ -8,6 +8,7 @@ module Rhom
     end
 
     def get_model_params
+      init_defaults
       BaseModel.model_params  
     end
 
@@ -19,17 +20,23 @@ module Rhom
         false
     end
     
-    def property(name,type=:string,option=nil)
-      if fixed_schema?()
-
-  	      BaseModel.model_params ||= {}
-
+    def init_defaults
+      if fixed_schema?
+          BaseModel.model_params ||= {}
           BaseModel.model_params['schema'] ||= {}
           BaseModel.model_params['schema']['property'] ||= {}
-          BaseModel.model_params['schema']['property'][name.to_s] = [type,option] 
       else
-  	      BaseModel.model_params ||= {}
+          BaseModel.model_params ||= {}
+          BaseModel.model_params ||= {}
           BaseModel.model_params['property'] ||= {}
+      end
+    end
+     
+    def property(name,type=:string,option=nil)
+      init_defaults
+      if fixed_schema?()
+          BaseModel.model_params['schema']['property'][name.to_s] = [type,option] 
+      else
           BaseModel.model_params['property'][name.to_s] = [type,option] 
       end
 

data/lib/framework/rhom/rhom_object_factory.rb

@@ -88,31 +88,35 @@ module Rhom
                 end
               end
 
-              @@metadata = {}
               class << self
 
-                def clean_cached_metadata
-                    src_name = get_source_name()
-                    @@metadata[src_name] = nil                    
-                end
-                
                 def metadata
                   src_name = get_source_name()
-                  return @@metadata[src_name] if @@metadata[src_name]
+                  return Rho::RhoController.cached_metadata[src_name] if Rho::RhoController.cached_metadata.has_key?(src_name)
+                  
                   db = ::Rho::RHO.get_src_db(src_name)
                   result = db.select_from_table('sources', 'metadata', {"name"=>src_name} )
                   if result && result.length > 0 && result[0]['metadata']
-                    @@metadata[src_name] = Rho::JSON.parse(result[0]['metadata'])
+                    Rho::RhoController.cached_metadata[src_name] = Rho::JSON.parse(result[0]['metadata'])
+                  else
+                    Rho::RhoController.cached_metadata[src_name] = nil                     
                   end
                   
-                  @@metadata[src_name]
+                  Rho::RhoController.cached_metadata[src_name]
                 end
 
                 def count
                   db = ::Rho::RHO.get_src_db(get_source_name)
                   
                   if is_schema_source()
-                    res = db.select_from_table(get_schema_table_name(),'object').length
+                    #res = db.select_from_table(get_schema_table_name(),'object').length
+                    db_res =  db.execute_sql("SELECT COUNT(*) FROM " + get_schema_table_name())
+                    #puts "db_res : #{db_res}"
+                    if db_res && db_res.length() > 0 
+                        res = db_res[0].values[0] 
+                    else
+                        res = 0
+                    end    
                   else
                     res = db.select_from_table('object_values','object', {"source_id"=>get_source_id}, {"distinct"=>true}).length
                   end
@@ -276,7 +280,7 @@ module Rhom
                     return sql, vals
                 end
 
-                def find_objects(condition_hash, op, limit, offset, order_attr)
+                def find_objects(condition_hash, op, limit, offset, order_attr, &block)
                     nulls_cond = {}
                     if op == 'AND'
                         condition_hash.each do |key,value|
@@ -288,7 +292,7 @@ module Rhom
                     end
                     
                     strLimit = nil
-                    if !order_attr 
+                    if !(block_given? || order_attr)
                         strLimit = " LIMIT " + limit.to_s + " OFFSET " + offset.to_s if limit && offset && condition_hash.length <= 1 && nulls_cond.length == 0
                     end
                     
@@ -311,8 +315,8 @@ module Rhom
                                 
                                 mapObjs[ rec['object'] ] = 1
                                 listObjs << rec
-                                
-                                bStop = !order_attr && limit && offset && nulls_cond.length == 0 && listObjs.length >= offset + limit
+
+                                bStop = !(block_given? || order_attr) && limit && offset && nulls_cond.length == 0 && listObjs.length >= offset + limit
                                 break if bStop
                             end
                             
@@ -357,7 +361,7 @@ module Rhom
                     res = []
                     listObjs.each do |obj|
                         nIndex += 1
-                        next if !order_attr && offset && nIndex < offset && !strLimit
+                        next if !(block_given? || order_attr) && offset && nIndex < offset && !strLimit
                         
                         bSkip = false
                         #obj_value = ::Rhom::RhomDbAdapter.get_value_for_sql_stmt(obj['object'])
@@ -383,11 +387,11 @@ module Rhom
                     res
                 end
 
-                def find_objects_ex(condition_ar, op, limit, offset, order_attr)
+                def find_objects_ex(condition_ar, op, limit, offset, order_attr, &block)
                     mapObjs = {}
                     listObjs = []
                     condition_ar.each do |cond|
-                        res = find_objects(cond[:conditions], cond[:op], limit, offset, order_attr)
+                        res = find_objects(cond[:conditions], cond[:op], limit, offset, order_attr, &block)
                         
                         if listObjs.length() == 0
                             if condition_ar.length() > 1
@@ -423,7 +427,7 @@ module Rhom
                 end
                                 
                 def find_bycondhash(args, &block)                
-                    #puts 'find_bycondhash start'
+                    #puts 'find_bycondhash start' + (block_given? ? 'with block' : "")
                     
                     condition_hash = {}
                     select_arr = nil
@@ -442,7 +446,8 @@ module Rhom
                           offset = args[1][:offset] ? args[1][:offset].to_i : 0
                         end
                         select_arr = args[1][:select] if args[1][:select]
-                        order_dir = args[1][:orderdir].upcase() if args[1][:orderdir]
+                        
+                        order_dir = args[1][:orderdir]
                         order_attr = args[1][:order]
                         
                         op = args[1][:op].upcase if args[1][:op]
@@ -456,9 +461,14 @@ module Rhom
                     attribs = nil
                     if select_arr
                       attribs = select_arr
-                      if order_attr 
+                      if order_attr
                         order_attr_arr = []
-                        order_attr_arr.push(order_attr)
+                        if order_attr.is_a?(Array)
+                            order_attr_arr = order_attr
+                        else    
+                            order_attr_arr.push(order_attr)
+                        end
+                            
                         attribs = attribs | order_attr_arr
                       end  
                     else
@@ -472,9 +482,9 @@ module Rhom
                     begin
                         listObjs = []
                         if condition_hash.is_a?(Hash)
-                            listObjs = find_objects(condition_hash, op, limit, offset, order_attr)
+                            listObjs = find_objects(condition_hash, op, limit, offset, order_attr, &block)
                         else
-                            listObjs = find_objects_ex(condition_hash, op, limit, offset, order_attr)
+                            listObjs = find_objects_ex(condition_hash, op, limit, offset, order_attr, &block)
                         end
 
                         nCount = 0;
@@ -538,24 +548,16 @@ module Rhom
                                 #end
                                 
                                 ret_list << new_obj
-                                break if !order_attr && limit && ret_list.length >= limit
+                                break if !(block_given? || order_attr) && limit && ret_list.length >= limit
                             end
                         end    
                     ensure
                       db.unlock_db
                     end
                   
-                    if order_attr
-                        ret_list.sort! { |x,y| 
-                           vx = x.vars[order_attr.to_sym()]
-                           vy = y.vars[order_attr.to_sym()]
-                           res = vx && vy ? (block_given? ? yield(vx,vy): vx <=> vy) : 0
-                           res *= -1 if order_dir && order_dir == 'DESC'
-                           res
-                        }
-                    end
+                    order_array(ret_list, order_attr,order_dir, &block)
 
-                    if order_attr && limit
+                    if (block_given? || order_attr) && limit
                         ret_list = ret_list.slice(offset,limit)
                     end
 
@@ -570,6 +572,70 @@ module Rhom
                     ret_list
                 end
 
+                def order_array(ret_list, order_attr, order_dir, &block)
+                    if order_attr
+                        ret_list.sort! { |x,y| 
+                        
+                            res = 0
+                            if order_attr.is_a?(Array)
+                                order_attr.each_index { |i|
+                                    vx = x.vars[order_attr[i].to_sym()]
+                                    vy = y.vars[order_attr[i].to_sym()]
+                                    res = vx && vy ? (block_given? ? yield(vx,vy): vx <=> vy) : 0
+
+                                    dir = 'ASC'
+                                    if order_dir && order_dir.is_a?(Array) && i < order_dir.length()
+                                        dir = order_dir[i].upcase()
+                                    else
+                                        dir = order_dir.upcase() if order_dir && order_dir.is_a?(String)
+                                    end
+                                   
+                                    res *= -1 if dir && dir == 'DESC'
+                                    break if res != 0
+                                }
+                            else
+                                vx = x.vars[order_attr.to_sym()]
+                                vy = y.vars[order_attr.to_sym()]
+                                res = vx && vy ? (block_given? ? yield(vx,vy): vx <=> vy) : 0
+                                res *= -1 if order_dir && order_dir == 'DESC'
+                            end    
+                            
+                            res
+                        }
+                    elsif block_given?
+                        ret_list.sort! { |x,y| 
+                           res = yield(x,y)
+                           res *= -1 if order_dir && order_dir == 'DESC'
+                           res
+                        }
+                    end
+                    
+                end
+                
+                def make_sql_order(params)
+                    order_attr = params[:order]
+                    order_dir = params[:orderdir]                    
+                    
+                    res = ""
+                    
+                    if order_attr && order_attr.is_a?(Array)
+                        order_attr.each_index do |i|
+                            res += "," if i > 0
+                            
+                            res += "\"#{order_attr[i]}\" "
+                            if order_dir && order_dir.is_a?(Array) && i < order_dir.length()
+                                res += order_dir[i].upcase()
+                            else
+                                res += order_dir && order_dir.is_a?(String) ? order_dir.upcase() : "ASC"
+                            end
+                        end                        
+                    else
+                        res = "\"#{order_attr}\" " + (order_dir ? order_dir.upcase() : "")
+                    end
+                    
+                    res
+                end
+                
                 # retrieve a single record if object id provided, otherwise return
                 # full list corresponding to factory's source id
                 def find(*args, &block)
@@ -629,8 +695,9 @@ module Rhom
                     end
                     
                     select_arr = args[1][:select] if args[1][:select]
-                    order_dir = args[1][:orderdir].upcase() if args[1][:orderdir]
+                    order_dir = args[1][:orderdir]
                     order_attr = args[1][:order]
+                    
                   end
                   
                   if args.first == :first
@@ -639,7 +706,7 @@ module Rhom
                   end
                   
                   strLimit = nil
-                  if !(block_given? && order_attr)
+                  if !block_given?
                       strLimit = " LIMIT " + limit.to_s + " OFFSET " + offset.to_s if limit && offset
                   end
                   
@@ -670,10 +737,10 @@ module Rhom
                           objects = [ { 'object' => strip_braces(args.first.to_s) } ]
                           
                         else  
-                          if !block_given? && order_attr
+                          if !block_given? && order_attr && order_attr.is_a?(String)
                               if  !args[1][:dont_ignore_missed_attribs]
                                   sql << "SELECT object FROM object_values WHERE source_id=? "
-                                  sql << " AND attrib=? ORDER BY \"value\" " + order_dir
+                                  sql << " AND attrib=? ORDER BY \"value\" " + ( order_dir ? order_dir : "")
                                   values << get_source_id
                                   values << order_attr
                               end    
@@ -753,7 +820,7 @@ module Rhom
                             sql << " FROM object_values ov \n"
                             sql << "where " + ::Rhom::RhomDbAdapter.where_str(where_cond) + "\n" if where_cond and where_cond.length > 0
                             sql << "group by object\n"
-                            sql << "order by \"#{order_attr}\" " + order_dir if !block_given? && order_attr
+                            sql << "order by " + make_sql_order(args[1]) if !block_given? && order_attr
                             #sql << ") WHERE " + ::Rhom::RhomDbAdapter.where_str(condition_hash) if condition_hash
                             sql << ") WHERE " + condition_str if condition_str
                             sql << strLimit if strLimit
@@ -775,7 +842,7 @@ module Rhom
                            sql << " WHERE " + condition_str if condition_str
                        end
                            
-                       sql << " order by \"#{order_attr}\" " + order_dir if !block_given? && order_attr
+                       sql << " order by " + make_sql_order(args[1]) if !block_given? && order_attr
                        sql << strLimit if strLimit
                        
                        #puts "Database query start" #: #{sql}"
@@ -804,17 +871,12 @@ module Rhom
                   else
                       puts "Processing rhom objects end, no attributes found."
                   end
-                 
-                  if block_given? && order_attr
-                    ret_list.sort! { |x,y| 
-                       vx = x.vars[order_attr.to_sym()]
-                       vy = y.vars[order_attr.to_sym()]
-                       res = vx && vy ? (block_given? ? yield(vx,vy): vx <=> vy) : 0
-                       res *= -1 if order_dir && order_dir == 'DESC'
-                       res
-                    }
+
+                  if block_given?
+                    order_array(ret_list, order_attr, order_dir, &block)
+                    ret_list = ret_list.slice(offset,limit) if limit
                   end
-                  
+                 
                   return list.length if args.first == :count
                   if args.first == :first || args.first.is_a?(String) 
                     return ret_list.length > 0 ? ret_list[0] : nil
@@ -882,8 +944,12 @@ module Rhom
 
                         puts "del_objects : #{del_objects}"
                         del_objects.each do |obj|
-                          db.delete_from_table(tableName, {'object'=>obj['object']})
-                          db.delete_from_table('changed_values', {'object'=>obj['object']}) if is_sync_source()
+                          if is_schema_source()
+                            db.delete_from_table(tableName, {'object'=>obj['object']})
+                          else
+                            db.delete_from_table(tableName, {'object'=>obj['object'], "source_id"=>get_source_id})
+                          end  
+                          db.delete_from_table('changed_values', {'object'=>obj['object'], "source_id"=>get_source_id}) if is_sync_source()
                         end
                       else
                         if is_schema_source()
@@ -1016,19 +1082,18 @@ module Rhom
                       attrsList = nil
                       if is_inst_schema_source()
                         attrsList = db.select_from_table(tableName, '*', {"object"=>obj}) 
+                        db.delete_from_table(tableName, {"object"=>obj})
                       else
                         attrsList = db.select_from_table(tableName, '*', {"object"=>obj, "source_id"=>self.get_inst_source_id()}) 
+                        db.delete_from_table(tableName, {"object"=>obj, "source_id"=>self.get_inst_source_id()})
                       end  
                       
-                      # first delete the record from viewable list
-                      db.delete_from_table(tableName, {"object"=>obj})
-                      
                       resUpdateType =  is_inst_sync_source() ? db.select_from_table('changed_values', 'update_type', {"object"=>obj, "update_type"=>'create', "sent"=>0}) : nil 
                       if resUpdateType && resUpdateType.length > 0 
                         update_type = nil                              
                       end
                       
-                      db.delete_from_table('changed_values', {"object"=>obj, "sent"=>0}) if is_inst_sync_source()
+                      db.delete_from_table('changed_values', {"object"=>obj, "source_id"=>self.get_inst_source_id(), "sent"=>0}) if is_inst_sync_source()
                       
                       if is_inst_sync_source() && update_type and attrsList and attrsList.length() > 0
                         # now add delete operation

data/lib/framework/version.rb

@@ -1,6 +1,6 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '2.2.4'
+    VERSION = '2.2.5'
   end
   unless defined? RhodesFramework::DBVERSION
     DBVERSION = '2.2.2'

data/lib/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.2.4'
+    VERSION = '2.2.5'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/platform/android/Rhodes/AndroidManifest.full.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.rhomobile.rhodes"
+      android:installLocation="auto"
+      android:versionCode="25"
+      android:versionName="2.2.4">
+    <uses-sdk android:minSdkVersion="3" />
+    <application android:icon="@drawable/icon"
+          android:multiprocess="true"
+          android:allowTaskReparenting="true"
+          android:debuggable="true"
+          finishOnTaskLaunch="true"
+          android:label="@string/app_name">
+        <activity android:name="com.rhomobile.rhodes.Rhodes"
+              android:label="@string/app_name"
+              android:configChanges="keyboardHidden|orientation">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.rhomobile.rhodes.camera.FileList" />
+        <activity android:name="com.rhomobile.rhodes.camera.ImageCapture" android:screenOrientation="landscape" />
+        <activity android:name="com.rhomobile.rhodes.signature.ImageCapture" />
+        <activity android:name="com.rhomobile.rhodes.datetime.DateTimePickerScreen" />
+        <activity android:name="com.rhomobile.rhodes.mapview.MapView" />
+        <activity android:name="com.rhomobile.rhodes.bluetooth.RhoBluetoothDeviceListActivity" />
+        <uses-library android:name="com.google.android.maps" />
+        <receiver android:name="com.rhomobile.rhodes.PushReceiver" android:permission="com.google.android.c2dm.permission.SEND">
+          <!-- Receive the actual message -->
+          <intent-filter>
+            <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+            <category android:name="com.rhomobile.rhodes" />
+          </intent-filter>
+          <!-- Receive the registration id -->
+          <intent-filter>
+            <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
+            <category android:name="com.rhomobile.rhodes" />
+          </intent-filter>
+        </receiver>
+    </application>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.READ_CALENDAR" />
+    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
+    <permission android:name="com.rhomobile.rhodes.permission.C2D_MESSAGE" android:protectionLevel="signature" />
+    <uses-permission android:name="com.rhomobile.rhodes.permission.C2D_MESSAGE" />
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+</manifest> 

data/platform/android/Rhodes/AndroidManifest.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.rhomobile.rhodes"
-      android:versionCode="25"
-      android:versionName="2.2.4">
+      android:installLocation="auto"
+      android:versionCode="26"
+      android:versionName="2.2.5">
     <uses-sdk android:minSdkVersion="3" />
     <application android:icon="@drawable/icon"
           android:multiprocess="true"
@@ -25,37 +26,5 @@
         <activity android:name="com.rhomobile.rhodes.mapview.MapView" />
         <activity android:name="com.rhomobile.rhodes.bluetooth.RhoBluetoothDeviceListActivity" />
         <uses-library android:name="com.google.android.maps" />
-        <receiver android:name="com.rhomobile.rhodes.PushReceiver" android:permission="com.google.android.c2dm.permission.SEND">
-          <!-- Receive the actual message -->
-          <intent-filter>
-            <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-            <category android:name="com.rhomobile.rhodes" />
-          </intent-filter>
-          <!-- Receive the registration id -->
-          <intent-filter>
-            <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
-            <category android:name="com.rhomobile.rhodes" />
-          </intent-filter>
-        </receiver>
     </application>
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.READ_CALENDAR" />
-    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
-    <permission android:name="com.rhomobile.rhodes.permission.C2D_MESSAGE" android:protectionLevel="signature" />
-    <uses-permission android:name="com.rhomobile.rhodes.permission.C2D_MESSAGE" />
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 </manifest>