da_funk 3.25.0 → 3.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e159119ab8221c6fbd3c3cd0f1a195705a167240d521bf126b549a314877558c
-  data.tar.gz: 387879c25676511a10558f4cc9223ad6db4c5751eb4b512081e00fa35304a0e6
+  metadata.gz: 311e4bb5dbb5ecdb3a478dd44abf39209723de9dc7fd5e5fa9d0cc862d164392
+  data.tar.gz: 708e6b4ad318d18bc9f5b5e46a5fd3a6132f82f36550aa77f715f901d13cbf33
 SHA512:
-  metadata.gz: 8d075f0b378705e54eff22b81d87e7680c137f7b913fc6edf9fa614639481f2aef155eba215416f794a5cf32c4d742c876134ba25122eef5e76a44a713e882b6
-  data.tar.gz: 110ab6b9851efa8cbe25be85ef9e7a127eada1b24d2a5c4a56ef7bc21ae0fa7aa9bc18984e81340ead4f7febe60c2a0c9d98cc9f1695f3e43bf9def48c65f6f7
+  metadata.gz: 67ddb6cbebcbe026dddc91bd4eb4eadbdb0a5e8a3f1d24f83677afbcc2249ab78ff2847618770492e0fa8223d771df9d3f8aa00708be1431f8255fd3d677ee4a
+  data.tar.gz: ded4f9f7947ca0423b946426bc7a1a440b88ecfa499acfd0f3f9e05c61c369c690f25511d6c1b3bb1b6008679722d88aaef8ee7378aea62abaef2a744f177c56

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.25.0)
+    da_funk (3.28.1)
       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,29 @@
 # DaFunk
 
+### 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.
+
 ### 3.25.0 - 2020-08-18
 
 - Added switch_http_enabled setting;

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/helper/status_bar.rb

@@ -90,25 +90,28 @@ module DaFunk
         if File.exists?('./shared/system_update')
           PAX::Display.print_status_bar(SLOT_UPDATE, "./shared/system_update_download.png")
           PAX::Display.print_status_bar(3, nil)
+          self.connected = false
         else
           change_message
         end
       end
 
       def self.change_message
-        connected = Device::Network.connected?
+        unless File.exists?('./shared/system_update')
+          connected = Device::Network.connected?
 
-        if connected != self.connected
-          self.connected = connected
+          if connected != self.connected
+            self.connected = connected
 
-          slot_message_1 = SLOT_MESSAGE_CONNECTION[self.connected][:slot1]
-          slot_message_2 = SLOT_MESSAGE_CONNECTION[self.connected][:slot2]
+            slot_message_1 = SLOT_MESSAGE_CONNECTION[self.connected][:slot1]
+            slot_message_2 = SLOT_MESSAGE_CONNECTION[self.connected][:slot2]
 
-          message_1 = SLOT_MESSAGE_CONNECTION[self.connected][:message1]
-          message_2 = SLOT_MESSAGE_CONNECTION[self.connected][:message2]
+            message_1 = SLOT_MESSAGE_CONNECTION[self.connected][:message1]
+            message_2 = SLOT_MESSAGE_CONNECTION[self.connected][:message2]
 
-          Device::Display.print_status_bar(slot_message_1, message_1)
-          Device::Display.print_status_bar(slot_message_2, message_2)
+            Device::Display.print_status_bar(slot_message_1, message_1)
+            Device::Display.print_status_bar(slot_message_2, message_2)
+          end
         end
       end
 

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

@@ -151,10 +151,14 @@ 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')
+      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.0"
+  VERSION="3.28.1"
 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

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.0
+  version: 3.28.1
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake