da_funk 3.25.1 → 3.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c51a5629c6bb3c16b5c95f9f75c31fbdd0c4dad7ab85853b90f22b31c51ac07d
-  data.tar.gz: 0ec037b370257e24893d21e642144b63c94298d066d4539a7deface8906c82c2
+  metadata.gz: b4d0d54c5c119b8292581b762890e56ac8236cfaba00da8a7771b7cbd7bb4e86
+  data.tar.gz: 010a769cea5606eb804a641d1608ee0eb26ee9284d987606b4654fde8a7c4dcf
 SHA512:
-  metadata.gz: 01332cd3a315619a08a7011d41b7d2a94d5c8ac4d9331a928a585a968eda3c5e05fb40f56776a4d7bed7b10db36072e5ba1314d71c08add652c653ffd01f1892
-  data.tar.gz: 2e0b2aff3a95c7e7e47b5b0c804e0011d218c42ed9a36ce114b6bf0194ecdf8b1aa52d06c84cdabd638055b19520a9c8e516facf535425d6cb2018509406ba45
+  metadata.gz: b395196c638fc69b56609d90eb1e460b1db746eca86d641964c7efb38106a154ba303aa4aa49b9e01134ea8658930630516fd7959a657d208f3787674ec145d1
+  data.tar.gz: c8f3818542777f7b5c2338913a6fe760a6f81532640a6b7e79e712f6ed76297f1c813071b4a5beb987b4c3830e023741ae84844811439e26423bb26e3e08f05c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.25.1)
+    da_funk (3.28.2)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -18,7 +18,7 @@ GEM
     cloudwalk (1.15.0)
       bundler
       rake
-    cloudwalk_handshake (1.14.0)
+    cloudwalk_handshake (1.20.0)
       funky-simplehttp (~> 0.6)
     funky-emv (1.4.1)
       funky-tlv (~> 0.2)
@@ -35,17 +35,17 @@ GEM
     rake (13.0.1)
     regexp_parser (1.7.1)
     rexml (3.2.4)
-    rubocop (0.86.0)
+    rubocop (0.90.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.0.3, < 1.0)
+      rubocop-ast (>= 0.3.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
+    rubocop-ast (0.4.0)
+      parser (>= 2.7.1.4)
     ruby-progressbar (1.10.1)
     unicode-display_width (1.7.0)
     yard (0.9.25)

data/RELEASE_NOTES.md

@@ -1,5 +1,31 @@
 # DaFunk
 
+### 3.28.2 - 2020-10-07
+
+- Added support of params.dat file restore if it was corrupted;
+- Wait 3 seconds before restart after main update;
+- Fixed method_missing exception;
+
+### 3.28.1 - 2020-09-26
+
+- Close socket in case of ssl exceptions;
+- Do not assign nil to PaymentChannel#current and client on error because this is already being done on PaymentChannel#close.
+
+### 3.28.0 - 2020-09-25
+
+- Check if system update file is present after device restart in order to continue with system update process;
+- Implemented block to write and break line if message has '\n'.
+
+### 3.27.0 - 2020-09-25
+
+- Print bitmap if exists on DaFunk::ParamsDat#restart;
+- Add main application version on config.dat file.
+
+### 3.26.0 - 2020-09-14
+
+- Fixed error on virtual keyboard, chars y and Y were duplicated;
+- Update cloudwalk_handshake (1.20.0).
+
 ### 3.25.1 - 2020-08-28
 
 - Set DaFunk::Helper::StatusBar#connected as false on system update process so it will cache again.

data/lib/da_funk/engine.rb

@@ -1,8 +1,13 @@
 module DaFunk
   class Engine
     def self.check
-      DaFunk::EventListener.check
-      ThreadScheduler.keep_alive
+      if Device::Setting.boot == '1'
+        DaFunk::EventListener.check(:file_exists) #to check if system update is in progress
+        Device::Setting.boot = '0'
+      else
+        DaFunk::EventListener.check
+        ThreadScheduler.keep_alive
+      end
     end
 
     def self.app_loop(&block)

data/lib/da_funk/i18n.rb

@@ -73,7 +73,11 @@ class I18n
 
   def self.pt(symbol, options = {})
     if options[:line] || options[:column]
-      Device::Display.print_line(t(symbol, options), options[:line] || 0, options[:column] || 0)
+      line = options[:line] || 0
+      t(symbol, options).split("\n").each do |message|
+        Device::Display.print_line(message, line, options[:column] || 0)
+        line+=1
+      end
     else
       puts(t(symbol, options))
     end

data/lib/da_funk/params_dat.rb

@@ -5,7 +5,7 @@ module DaFunk
     include DaFunk::Helper
 
     class << self
-      attr_accessor :file, :apps, :valid, :files
+      attr_accessor :file, :apps, :valid, :files, :checksum
     end
 
     self.apps = Array.new
@@ -20,9 +20,19 @@ module DaFunk
     end
 
     def self.setup
+      @checksum = calculate_checksum
       @file = FileDb.new(FILE_NAME)
     end
 
+    def self.calculate_checksum
+      Device::Crypto.crc16_hex(File.read(FILE_NAME)) if exists?
+    end
+
+    def self.corrupted?
+      return true unless exists?
+      @checksum != calculate_checksum
+    end
+
     def self.exists?
       File.exists?(FILE_NAME)
     end
@@ -151,10 +161,15 @@ module DaFunk
 
     def self.restart
       Device::Display.clear
-      I18n.pt(:admin_main_update_message)
-      3.times do |i|
-        Device::Display.print("REBOOTING IN #{3 - i}",3,3)
-        sleep(1)
+      if File.exists?('./shared/init_reboot.bmp')
+        Device::Display.print_bitmap('./shared/init_reboot.bmp')
+        getc(3000)
+      else
+        I18n.pt(:admin_main_update_message)
+        3.times do |i|
+          Device::Display.print("REBOOTING IN #{3 - i}",3,3)
+          sleep(1)
+        end
       end
       Device::System.restart
     end

data/lib/da_funk/payment_channel.rb

@@ -231,8 +231,7 @@ module DaFunk
       if Context.development?
         ContextLog.exception(exception, exception.backtrace, "PaymentChannel error")
       end
-      PaymentChannel.current = nil
-      @client = nil
+      self.close
     end
 
     def handshake

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.25.1"
+  VERSION="3.28.2"
 end
 

data/lib/device/setting.rb

@@ -67,7 +67,8 @@ class Device
       "transaction_http_host"       => HTTP_HOST_PRODUCTION,
       "transaction_http_port"       => HTTP_PORT,
       "emv_contactless_amount"      => "0",
-      "network_init"                => ""
+      "network_init"                => "",
+      "main_app_version"            => ""
     }
 
     class << self
@@ -151,16 +152,16 @@ class Device
 
     # Custom Attributes
     def self.tcp_recv_timeout
-      DaFunk::ParamsDat.file["tcp_recv_timeout"] || method_missing(:tcp_recv_timeout)
+      DaFunk::ParamsDat.file["tcp_recv_timeout"] || @file&.dig("tcp_recv_timeout")
     end
 
     def self.attach_gprs_timeout
-      value = (DaFunk::ParamsDat.file["attach_gprs_timeout"] || method_missing(:attach_gprs_timeout))
+      value = (DaFunk::ParamsDat.file["attach_gprs_timeout"] || @file&.dig("attach_gprs_timeout"))
       value.to_s.empty? ? nil : value.to_s.to_i
     end
 
     def self.heartbeat
-      DaFunk::ParamsDat.file["heartbeat"] || method_missing(:heartbeat)
+      DaFunk::ParamsDat.file["heartbeat"] || @file&.dig("heartbeat")
     end
 
     def self.logical_number

data/lib/device/virtual_keyboard.rb

@@ -28,7 +28,7 @@ class Device
         { x: 0..201, y: 223..241, char: 'k' },
         { x: 0..230, y: 223..241, char: 'l' },
         { x: 0..30,  y: 223..273, char: :keyboard_uppercase },
-        { x: 0..56,  y: 223..273, char: 'y' },
+        { x: 0..56,  y: 223..273, char: 'z' },
         { x: 0..82,  y: 223..273, char: 'x' },
         { x: 0..109, y: 223..273, char: 'c' },
         { x: 0..130, y: 223..273, char: 'v' },
@@ -65,7 +65,7 @@ class Device
         { x: 0..201, y: 223..241, char: 'K' },
         { x: 0..230, y: 223..241, char: 'L' },
         { x: 0..30,  y: 223..273, char: :keyboard_capital },
-        { x: 0..56,  y: 223..273, char: 'Y' },
+        { x: 0..56,  y: 223..273, char: 'Z' },
         { x: 0..82,  y: 223..273, char: 'X' },
         { x: 0..109, y: 223..273, char: 'C' },
         { x: 0..130, y: 223..273, char: 'V' },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 3.25.1
+  version: 3.28.2
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-29 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake