Some plyer improvements

README.md

@@ -38,7 +38,7 @@ implement the API in the easiest way, depending on the current platform.
 
 | Platform                       | Android | iOS | Windows | macOS | Linux |
 | ------------------------------ |:-------:|:---:|:-------:|:-----:|:-----:|
-| Accelerometer                  | ✔       |  ✔ |         | ✔     |   ✔   |
+| Accelerometer                  | ✔       |  ✔  |         | ✔     |   ✔   |
 | Audio recording                | ✔       |     |    ✔    | ✔     |       |
 | Barometer                      | ✔       |  ✔  |         |       |       |
 | Battery                        | ✔       |  ✔  |    ✔    | ✔     |   ✔   |
@@ -51,7 +51,7 @@ implement the API in the easiest way, depending on the current platform.
 | Devicename                     | ✔       |     |    ✔    | ✔     |   ✔   |
 | Email (open mail client)       | ✔       |  ✔  |    ✔    | ✔     |   ✔   |
 | Flash                          | ✔       |  ✔  |         |       |       |
-| GPS                            | ✔       |  ✔  |         |       |       |
+| GPS                            | ✔       |  ✔  |         | ✔     |       |
 | Gravity                        | ✔       |  ✔  |         |       |       |
 | Gyroscope                      | ✔       |  ✔  |         |       |       |
 | Humidity                       | ✔       |     |         |       |       |

plyer/facades/orientation.py

@@ -40,6 +40,12 @@ class Orientation:
     Orientation facade.
     '''
 
+    def get_orientation(self) -> str:
+        '''
+        Return current screen rotation (landscape, landscape-reversed, portrait, portrait-reversed, unknown)
+        '''
+        return self._get_landscape()
+
     def set_landscape(self, reverse=False):
         '''
         Rotate the app to a landscape orientation.
@@ -71,6 +77,9 @@ def set_sensor(self, mode='any'):
 
     # private
 
+    def _get_landscape(self, **kwargs):
+        raise NotImplementedError()
+
     def _set_landscape(self, **kwargs):
         raise NotImplementedError()
 

plyer/facades/wifi.py

@@ -101,6 +101,12 @@ def is_connected(self, interface=None):
         '''
         return self._is_connected(interface=interface)
 
+    def connected_ssid(self, interface=None):
+        '''
+        Return returns ssid of connected WiFi interface.
+        '''
+        return self._connected_ssid(interface=interface)
+
     @property
     def interfaces(self):
         '''
@@ -165,6 +171,9 @@ def _is_enabled(self):
     def _is_connected(self, interface=None):
         raise NotImplementedError()
 
+    def _connected_ssid(self, interface=None):
+        raise NotImplementedError()
+
     def _start_scanning(self, interface=None):
         raise NotImplementedError()
 

plyer/platforms/android/devicename.py

@@ -5,8 +5,6 @@
 from jnius import autoclass
 from plyer.facades import DeviceName
 
-Build = autoclass('android.os.Build')
-
 
 class AndroidDeviceName(DeviceName):
     '''
@@ -23,7 +21,18 @@ def _get_device_name(self):
 
         Thereby making this method more backward compatible.
         """
-        return Build.MODEL
+
+        Build = autoclass('android.os.Build')
+        PythonActivity = autoclass('org.kivy.android.PythonActivity')
+        SettingsGlobal = autoclass('android.provider.Settings$Global')
+
+        context = PythonActivity.mActivity
+        name = SettingsGlobal.getString(context.getContentResolver(), SettingsGlobal.DEVICE_NAME)
+
+        if not name:
+            name = Build.MODEL
+
+        return name
 
 
 def instance():

plyer/platforms/android/keystore.py

@@ -1,10 +1,21 @@
+import base64
+import json
+
+from jnius import autoclass
+
 from plyer.facades import Keystore
 from plyer.platforms.android import activity
 
 
 class AndroidKeystore(Keystore):
-
     def _set_key(self, servicename, key, value, **kwargs):
+        cipher_text, iv = self.encrypt_value(value, servicename)
+
+        value = json.dumps({
+            'cipher': base64.b64encode(cipher_text).decode(),
+            'iv': base64.b64encode(iv).decode()
+        })
+
         mode = kwargs.get("mode", 0)
         settings = activity.getSharedPreferences(servicename, mode)
         editor = settings.edit()
@@ -14,12 +25,62 @@ def _set_key(self, servicename, key, value, **kwargs):
     def _get_key(self, servicename, key, **kwargs):
         mode = kwargs.get("mode", 0)
         default = kwargs.get("default", "__None")
+
         settings = activity.getSharedPreferences(servicename, mode)
         ret = settings.getString(key, default)
-        if ret == "__None":
-            ret = None
-        return ret
+        if ret == default:
+            return None
+
+        blob = json.loads(ret)
+        return self.decrypt_value(servicename, blob)
+
+    def encrypt_value(self, value, servicename):
+        Cipher = autoclass('javax.crypto.Cipher')
+        secret_key = self.get_secret_key(servicename)
+
+        cipher = Cipher.getInstance("AES/GCM/NoPadding")
+        cipher.init(Cipher.ENCRYPT_MODE, secret_key)
+
+        ciphertext = cipher.doFinal(value.encode("utf-8"))
+        iv = cipher.getIV()
+        return ciphertext, iv
+
+    def decrypt_value(self, servicename, data):
+        GCMParameterSpec = autoclass('javax.crypto.spec.GCMParameterSpec')
+        Cipher = autoclass('javax.crypto.Cipher')
+        String = autoclass('java.lang.String')
+
+        secret_key = self.get_secret_key(servicename)
+        cipher = Cipher.getInstance("AES/GCM/NoPadding")
+
+        iv = base64.b64decode(data['iv'])
+        ct = base64.b64decode(data['cipher'])
+
+        spec = GCMParameterSpec(128, iv)
+        cipher.init(Cipher.DECRYPT_MODE, secret_key, spec)
+        plaintext_bytes = cipher.doFinal(ct)
+        return str(String(plaintext_bytes, "UTF-8"))
+
+    @staticmethod
+    def get_secret_key(servicename):
+        KeyProperties = autoclass('android.security.keystore.KeyProperties')
+        KeyGenerator = autoclass('javax.crypto.KeyGenerator')
+        KeyGenParameterSpec = autoclass('android.security.keystore.KeyGenParameterSpec$Builder')
+        KeyStore = autoclass('java.security.KeyStore')
+
+        key_store = KeyStore.getInstance("AndroidKeyStore")
+        key_store.load(None)
+
+        if not key_store.containsAlias(servicename):
+            builder = KeyGenParameterSpec(servicename,
+                                        KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT)
+            builder.setBlockModes(KeyProperties.BLOCK_MODE_GCM)
+            builder.setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
+            key_gen = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, "AndroidKeyStore")
+            key_gen.init(builder.build())
+            key_gen.generateKey()
 
+        return key_store.getKey(servicename, None)
 
 def instance():
     return AndroidKeystore()

plyer/platforms/android/orientation.py

@@ -3,6 +3,7 @@
 from plyer.facades import Orientation
 
 ActivityInfo = autoclass('android.content.pm.ActivityInfo')
+Surface = autoclass('android.view.Surface')
 
 
 class AndroidOrientation(Orientation):
@@ -38,6 +39,18 @@ def _set_sensor(self, **kwargs):
             activity.setRequestedOrientation(
                 ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT)
 
+    def _get_orientation(self):
+        orientations = {
+            Surface.ROTATION_0: 'portrait',
+            Surface.ROTATION_90: 'landscape',
+            Surface.ROTATION_180: 'portrait-reversed',
+            Surface.ROTATION_270: 'landscape-reversed',
+        }
+
+        rotation = activity.getWindowManager().getDefaultDisplay().getRotation()
+
+        return orientations.get(rotation, 'unknown')
+
 
 def instance():
     return AndroidOrientation()

plyer/platforms/ios/devicename.py

@@ -0,0 +1,29 @@
+'''
+Module of macOS API for plyer.devicename.
+'''
+
+from pyobjus import autoclass
+from pyobjus.dylib_manager import load_framework
+
+from plyer.facades import DeviceName
+
+load_framework('/System/Library/Frameworks/UIKit.framework')
+
+
+class IosDeviceName(DeviceName):
+    '''
+    Implementation of IOS DeviceName API.
+    '''
+
+    def _get_device_name(self):
+        UIDevice = autoclass('UIDevice')
+        device = UIDevice.currentDevice()
+        device_name = device.name.UTF8String()
+        return device_name
+
+
+def instance():
+    '''
+    Instance for facade proxy.
+    '''
+    return IosDeviceName()

plyer/platforms/linux/orientation.py

@@ -5,7 +5,7 @@
 class LinuxOrientation(Orientation):
 
     def _set_landscape(self, **kwargs):
-        self.rotate = 'normal'
+        self.rotate = 'inverted' if kwargs['reverse'] else 'normal'
         self.screen = sb.check_output(
             "xrandr -q | grep ' connected' |  head -n 1 | cut -d ' ' -f1",
             shell=True
@@ -14,14 +14,37 @@ def _set_landscape(self, **kwargs):
         sb.call(["xrandr", "--output", self.screen, "--rotate", self.rotate])
 
     def _set_portrait(self, **kwargs):
-        self.rotate = 'left'
+        self.rotate = 'right' if kwargs['reverse'] else 'left'
         self.screen = sb.check_output(
             "xrandr -q | grep ' connected' |  head -n 1 | cut -d ' ' -f1",
             shell=True
         )
         self.screen = self.screen.decode('utf-8').split('\n')[0]
         sb.call(["xrandr", "--output", self.screen, "--rotate", self.rotate])
 
+    def _get_orientation(self, **kwargs):
+        self.screen = sb.check_output(
+            "xrandr -q | grep ' connected' |  head -n 1 | cut -d ' ' -f1",
+            shell=True
+        )
+        self.screen = self.screen.decode('utf-8').split('\n')[0]
+
+        try:
+            orientation = sb.check_output(
+                f"xrandr -q --verbose | grep {self.screen} | sed 's/primary //' | awk '{{print $5}}'",
+                shell=True
+            ).decode('utf-8').strip()
+        except Exception:
+            return 'unknown'
+
+        orientations = {
+            'normal': 'landscape',
+            'inverted': 'landscape-reversed',
+            'left': 'portrait',
+            'right': 'portrait-reversed'
+        }
+        return orientations.get(orientation, 'unknown')
+
 
 def instance():
     return LinuxOrientation()

plyer/platforms/linux/wifi.py

@@ -115,6 +115,21 @@ def _is_connected(self, interface=None):
 
         return connected
 
+    def _connected_ssid(self, interface=None):
+        if not self._is_enabled():
+            self._enable()
+
+        ssid = None
+        ssid_proc = Popen(['nmcli', '-t', '-f', 'ACTIVE,NAME', 'connection'], stdout=PIPE)
+        ssid_lines = ssid_proc.communicate()[0].decode('utf-8').splitlines()
+        for ssid_line in ssid_lines:
+            active, ssid_value = ssid_line.split(':')
+            if active == 'yes':
+                ssid = ssid_value
+                break
+
+        return ssid
+
     def _start_scanning(self, interface=None):
         '''
         Start scanning for available Wi-Fi networks
@@ -359,6 +374,21 @@ def _is_connected(self, interface=None):
 
         return connected
 
+    def _connected_ssid(self, interface=None):
+        if not self._is_enabled():
+            self._enable()
+
+        ssid = None
+        ssid_proc = Popen(['nmcli', '-t', '-f', 'ACTIVE,NAME', 'connection'], stdout=PIPE)
+        ssid_lines = ssid_proc.communicate()[0].decode('utf-8').splitlines()
+        for ssid_line in ssid_lines:
+            active, ssid_value = ssid_line.split(':')
+            if active == 'yes':
+                ssid = ssid_value
+                break
+
+        return ssid
+
     def _start_scanning(self, interface=None):
         '''
         Returns all the network information.

plyer/platforms/macosx/devicename.py

@@ -2,18 +2,24 @@
 Module of MacOSX API for plyer.devicename.
 '''
 
-import socket
+from pyobjus import autoclass
+from pyobjus.dylib_manager import INCLUDE, load_framework
+
 from plyer.facades import DeviceName
 
+load_framework(INCLUDE.Foundation)
+
 
 class OSXDeviceName(DeviceName):
     '''
     Implementation of MacOSX DeviceName API.
     '''
 
     def _get_device_name(self):
-        hostname = socket.gethostname()
-        return hostname
+        NSHost = autoclass('NSHost')
+        current_host = NSHost.currentHost()
+        name = current_host.localizedName.UTF8String()
+        return name
 
 
 def instance():