Merge branch 'master' of github.com:rhomobile/rhodes

rhomobile · Mar 4, 2015 · 693db9b · 693db9b
2 parents d9c4f19 + 16fa3f3
commit 693db9b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/lib/build/rhoDevelopment.rb b/lib/build/rhoDevelopment.rb
@@ -222,7 +222,7 @@ def extract_state_file_from_bundle_zip(zip_path, path_for_save_state_file)
 
   chdir tmp_folder
 
-  Jake.run('unzip', [zip_path, '-d', tmp_folder])
+  Jake.unzip(zip_path, tmp_folder)
 
   state_path = File.join(tmp_folder, 'RhoBundle','apps', 'rhofilelist.txt')
 

diff --git a/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraRhoListener.java b/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraRhoListener.java
@@ -122,8 +122,8 @@ else if (captureUri != null )
 						}
 						if (!curPath.equals(targetPath)) 
 						{
-							Utils.copy(curPath, targetPath);
-							curFile.delete();
+						//	Utils.copy(curPath, targetPath);
+						//	curFile.delete();
 							Logger.T(TAG, "File copied to " + targetPath);							
 							curUri = Uri.fromFile(new File(targetPath));
 						}

diff --git a/lib/commonAPI/mediacapture/ext/platform/wp8/src/Camera_impl.cs b/lib/commonAPI/mediacapture/ext/platform/wp8/src/Camera_impl.cs
@@ -983,9 +983,8 @@ void cam_Initialized(object sender, Microsoft.Devices.CameraOperationCompletedEv
                         try
                         {
                             KeyValuePair<double, Size> CameraResolution = Rho_Supported_Resolutions.Aggregate((x, y) => Math.Abs(x.Value.Height - Rho_Paramenters["desired_height"]) < Math.Abs(y.Value.Height - Rho_Paramenters["desired_height"]) ? x : y);
-                            Size objsize = new Size(CameraResolution.Value.Height, CameraResolution.Value.Width + 550);
-
-                            Rho_StillCamera.Resolution = objsize;
+
+                            Rho_StillCamera.Resolution = CameraResolution.Value;
 
                         }
                         catch (Exception ex)

diff --git a/platform/android/Rhodes/src/com/rhomobile/rhodes/ui/FileList.java b/platform/android/Rhodes/src/com/rhomobile/rhodes/ui/FileList.java
@@ -144,7 +144,7 @@ private void doCallback(int status, String filename) {
                 //intent.putExtra(MediaStore.EXTRA_OUTPUT, dstUrl);
                 intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(filename)));
             } else {
-                intent.putExtra("error", "No input file name");
+                intent.putExtra("cancel", "No input file name");
             }
 //        } catch (IOException e) {
 //            Logger.E(TAG, e);

diff --git a/platform/iphone/rbuild/iphone.rake b/platform/iphone/rbuild/iphone.rake
@@ -61,9 +61,12 @@ def set_app_plist_options(fname, appname, bundle_identifier, version, url_scheme
   update_plist_block(fname) do |hash|
     hash['CFBundleDisplayName'] = appname
     hash['CFBundleIdentifier'] = bundle_identifier
-    hash['CFBundleURLTypes'] ||= []
 
-    hash['CFBundleURLTypes'].first do |elem|
+    if hash['CFBundleURLTypes'].empty?
+      hash['CFBundleURLTypes'] = {'CFBundleURLName' => bundle_identifier, 'CFBundleURLSchemes' => [url_scheme] }
+    else
+      elem = hash['CFBundleURLTypes'].first
+
       elem['CFBundleURLName'] = bundle_identifier
       elem['CFBundleURLSchemes'] = [url_scheme] unless url_scheme.nil?
     end