device_api-android 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e869674eefcdfc233369a21f2d14d11d27df450
-  data.tar.gz: 6da4897b07d21f066230bd3bd9ada5f3240a6764
+  metadata.gz: 7dfe569584ed7b09ceb48bb274a0c974798f10f6
+  data.tar.gz: 8269d27b46ae49ff8bf354f06dfa8abb8bc713ce
 SHA512:
-  metadata.gz: e543135408a47beef36b487b98d481235120f441df30af60aae043a5775ae1d131fc9cd9ca802f91977a3e258956c8d4f1677d78b930a42bc965c56dfd8d9bbe
-  data.tar.gz: f62b5e92503750c0bdd704295761b7189aa1e2e4193e41f1c7611201f689d32581621463b2234f662fc5fe95fc480a715a5bf0e4a0edefcba9b570917d356f91
+  metadata.gz: 95d0ded27c12b01421de3d766a7373ef79d18effc903ae420a5091e81af378fed9a7ef845998db7d25496826c7d8f5d9e4d2a7b22fb85ee4481185c90eb9d3de
+  data.tar.gz: 4ae9c1c9b96d4df37ad18cbb41ef01344e47204baf03c92cbeab6231f5b9aa60356d7eb53c34e8e21cfedd8dabff876dfe3fd91d9b9c8f3993298643e51617cd

data/lib/device_api/android.rb

@@ -10,6 +10,7 @@ require 'device_api/android/plugins/disk'
 
 # Load additional device types
 require 'device_api/android/device/kindle'
+require 'device_api/android/device/samsung'
 
 module DeviceAPI
   module Android
@@ -17,7 +18,7 @@ module DeviceAPI
     def self.devices
       ADB.devices.map do |d|
         if d.keys.first && !d.keys.first.include?('?')
-          DeviceAPI::Android::Device.create( self.get_device_type(d.keys.first), { serial: d.keys.first, state: d.values.first } )
+          DeviceAPI::Android::Device.create( self.get_device_type(d), { serial: d.keys.first, state: d.values.first } )
         end
       end
     end
@@ -28,15 +29,18 @@ module DeviceAPI
         raise DeviceAPI::BadSerialString.new("serial was '#{serial.nil? ? 'nil' : serial}'")
       end
       state = ADB.get_state(serial)
-      DeviceAPI::Android::Device.create( self.get_device_type(serial),  { serial: serial, state: state })
+      DeviceAPI::Android::Device.create( self.get_device_type({ "#{serial}": state}),  { serial: serial, state: state })
     end
 
     # Return the device type used in determining which Device Object to create
-    def self.get_device_type(serial)
-      return :default if Device.new(serial: serial).manufacturer.nil?
-      case Device.new(serial: serial).manufacturer.downcase
+    def self.get_device_type(options)
+      return :default if options.values.first == 'unauthorized'
+      return :default if Device.new(serial: options.keys.first, state: options.values.first).manufacturer.nil?
+      case Device.new(serial: options.keys.first).manufacturer.downcase
         when 'amazon'
           type = :kindle
+        when 'samsung'
+          type = :samsung
         else
           type = :default
       end

data/lib/device_api/android/adb.rb

@@ -42,7 +42,7 @@ module DeviceAPI
 
         raise ADBCommandError.new(result.stderr) if result.exit != 0
 
-        lines = result.stdout.encode('UTF-8', invalid: :replace).split("\n")
+        lines = result.stdout.encode('UTF-16', 'UTF-8', invalid: :replace, replace: '').encode('UTF-8', 'UTF-16').split("\n")
 
         process_dumpsys('\[(.*)\]:\s+\[(.*)\]', lines)
       end
@@ -263,12 +263,40 @@ module DeviceAPI
       # @param serial serial number of device 
       # @param command -option activity 
       # @example
-      # DeviceAPI::ADB.am(serial, "-a android.intent.action.MAIN -n com.android.settings/.wifi.WifiSettings")
+      # DeviceAPI::ADB.am(serial, "start -a android.intent.action.MAIN -n com.android.settings/.wifi.WifiSettings")
       def self.am(serial, command)
-        result = execute("adb -s #{serial} shell am start #{command}")
+        result = execute("adb -s #{serial} shell am #{command}")
         raise ADBCommandError.new(result.stderr) if result.exit != 0
         return result.stdout
       end
+
+      # Package manager commands
+      # @param serial serial of device
+      # @param command command to issue to the package manager
+      # @example DeviceAPI::ADB.pm(serial, 'list packages')
+      def self.pm(serial, command)
+        result = execute("adb -s #{serial} shell pm #{command}")
+        raise ADBCommandError.new(result.stderr) if result.exit != 0
+        return result.stdout
+      end
+
+      # Blocks a package, used on Android versions less than KitKat
+      # Returns boolean
+      # @param serial serial of device
+      # @param package to block
+      def self.block_package(serial, package)
+        result = pm(serial, "block #{package}")
+        result.include?('true')
+      end
+
+      # Blocks a package on KitKat and above
+      # Returns boolean
+      # @param serial serial of device
+      # @param package to hide
+      def self.hide_package(serial, package)
+        result = pm(serial, "hide #{package}")
+        result.include?('true')
+      end
     end
 
     # ADB Error class

data/lib/device_api/android/device.rb

@@ -86,6 +86,14 @@ module DeviceAPI
         !get_battery_info.select { |keys| keys.include?('powered')}.select { |_,v| v == 'true' }.empty?
       end
 
+      def block_package(package)
+        if version < "5.0.0"
+          ADB.block_package(serial, package)
+        else
+          ADB.hide_package(serial, package)
+        end
+      end
+
       # Return the device orientation
       # @return (String) current device orientation
       def orientation
@@ -141,6 +149,11 @@ module DeviceAPI
         result
       end
 
+      def list_installed_packages
+        packages = ADB.pm(serial, 'list packages')
+        packages.split("\r\n")
+      end
+
       # Return the app version number for a specified apk
       # @param [String] apk string containing path to the apk
       # @return [String, Exception] app version number if it can be found, otherwise an error is raised
@@ -220,8 +233,8 @@ module DeviceAPI
       # @param [String] command to start the intent
       # Return the stdout of executed intent
       # @return [String] stdout
-      def start_intent(command)
-        ADB.am(serial,command)
+      def intent(command)
+        ADB.am(serial, command)
       end
 
       #Reboots the device

data/lib/device_api/android/device/samsung.rb

@@ -0,0 +1,18 @@
+module DeviceAPI
+  module Android
+    # Samsung specific device class
+    class Samsung < Device
+      def initialize(options = {})
+
+        super
+        packages = list_installed_packages
+        multi_window = 'com.sec.android.app.FlashBarService'
+        if packages.include?("package:#{multi_window}")
+          # Stop the multi window function from running and block it
+          intent("force-stop #{multi_window}")
+          block_package("#{multi_window}")
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: device_api-android
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - David Buckhurst
 - Jitesh Gosai
+- Asim Khan
 - Jon Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: device_api
@@ -58,6 +59,7 @@ files:
 - lib/device_api/android/adb.rb
 - lib/device_api/android/device.rb
 - lib/device_api/android/device/kindle.rb
+- lib/device_api/android/device/samsung.rb
 - lib/device_api/android/plugins/battery.rb
 - lib/device_api/android/plugins/disk.rb
 - lib/device_api/android/plugins/memory.rb