rhodes 7.5.1 → 7.6.0

data/platform/android/Rhodes/src/com/rhomobile/rhodes/permissioncheck/PermissionListGenerate.java

@@ -0,0 +1,366 @@
+package com.rhomobile.rhodes.permissioncheck;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PermissionInfo;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.provider.Settings;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+import android.util.Log;
+
+
+
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import com.rhomobile.rhodes.RhoConf;
+import com.rhomobile.rhodes.kioskservices.PermissionManager;
+
+
+public class PermissionListGenerate {
+    private final Context mContext;
+    private final Activity mActivity;
+    private AlertDialog mPermissionsDialog = null;
+    private final Map<String, ArrayList<String>> permissionsMap = new HashMap<String, ArrayList<String>>();
+    private AlertDialog.Builder ad;
+    final static private Integer MY_PERMISSIONS_REQUEST = 1;
+    private final String accessibility_key = "ACCESSIBILITY_SERVICE";
+
+    public PermissionListGenerate(Context context, Activity activity){
+        this.mContext = context;
+        this.mActivity = activity;
+
+        this.ad = new AlertDialog.Builder(context);
+
+        try {
+            init();
+        } catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    private void init() throws PackageManager.NameNotFoundException {
+        PackageInfo info = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(),PackageManager.GET_PERMISSIONS);
+        int sdkVersion = Build.VERSION.SDK_INT;
+
+        for(String p :info.requestedPermissions){
+            if(sdkVersion >= 29) {
+                PermissionInfo permissionInfo = mContext.getPackageManager().getPermissionInfo(p, 0);
+                int protectionLevel = permissionInfo.protectionLevel;
+                if (protectionLevel == PermissionInfo.PROTECTION_DANGEROUS || p.equals("android.permission.MANAGE_EXTERNAL_STORAGE"))
+                    addToListPermission(p);
+            }else{
+                if(!p.equals("android.permission.MANAGE_EXTERNAL_STORAGE")){
+                    PermissionInfo permissionInfo = mContext.getPackageManager().getPermissionInfo(p, 0);
+                    int protectionLevel = permissionInfo.protectionLevel;
+                    if (protectionLevel == PermissionInfo.PROTECTION_DANGEROUS)
+                        addToListPermission(p);
+                }
+            }
+        }        
+    }
+
+
+
+    public void addToListPermission(String permissionName){
+        String nameKey = formatName(permissionName);
+        Log.d("permissionCheck", permissionName);
+
+        if(permissionsMap.get(nameKey) != null)
+        {
+            ArrayList<String> i = permissionsMap.get(nameKey);
+            if(!i.contains(permissionName)) {
+                i.add(permissionName);
+                permissionsMap.remove(nameKey);
+                permissionsMap.put(nameKey, i);
+            }
+        }else{
+            ArrayList<String> i = new ArrayList<String>();
+            i.add(permissionName);
+            permissionsMap.put(nameKey, i);
+        }
+    }
+
+
+    @NonNull
+    private String formatName(String name) {
+        if(name == accessibility_key)
+            return "accessibility services";
+
+        name = name.toLowerCase(Locale.ROOT);
+
+        String[] splitNameToPoint = name.split("\\.");
+        String[] splitName = splitNameToPoint[splitNameToPoint.length -1].split("_");
+
+        StringBuilder returnName = new StringBuilder();
+        boolean firstWord = true;
+        for(int i = 0; i < splitName.length; i++){
+            if(!splitName[i].equals("read") && !splitName[i].equals("write") && !splitName[i].equals("manage"))
+            {
+                if(!firstWord)
+                    returnName.append(" ");
+                else
+                    firstWord = false;
+
+                returnName.append(splitName[i]);
+            }
+        }
+        return returnName.toString();
+    }
+
+
+
+    public boolean checkAllPermissionsStatus(){
+        if( RhoConf.isExist("click_sound_with_accessibility_service") && 
+            RhoConf.getBool("click_sound_with_accessibility_service")){
+                if(permissionsMap.get(accessibility_key) == null){
+                    ArrayList<String> p = new ArrayList<String>();
+                    p.add(accessibility_key);
+                    permissionsMap.put(accessibility_key,p);
+                }
+            }
+        if(RhoConf.getInt("strict_permission_requirements") == 1){
+            for(Map.Entry<String, ArrayList<String>> entry : permissionsMap.entrySet()){
+                if(!getPermissionStatus(entry.getValue()))
+                    return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean getPermissionStatus(@NonNull String pNameManifest){
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
+            pNameManifest.equals("android.permission.MANAGE_EXTERNAL_STORAGE"))
+            return Environment.isExternalStorageManager();
+        else
+            return ContextCompat.checkSelfPermission(mContext, pNameManifest) == PackageManager.PERMISSION_GRANTED;
+    }
+    private boolean getPermissionStatus(@NonNull ArrayList<String> pNameManifest){
+        if(pNameManifest.contains(accessibility_key))
+            return PermissionManager.checkAccessibilityServicePermission(mContext);
+
+        for(String value : pNameManifest){
+            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && value.equals("android.permission.MANAGE_EXTERNAL_STORAGE")){
+                boolean manageExternal =  Environment.isExternalStorageManager();
+                if(!manageExternal)
+                    return false;
+            }
+            else 
+                if(ContextCompat.checkSelfPermission(mContext, value) != PackageManager.PERMISSION_GRANTED)
+                    return false;
+        }
+        return true;
+    }
+
+
+
+    public boolean isShowPermissionDialog(){
+        return mPermissionsDialog != null && mPermissionsDialog.isShowing();
+    }
+    public void closePermissionsDialog(){
+        if(mPermissionsDialog != null)
+            mPermissionsDialog.cancel();
+    }
+
+
+
+    public void showPermissionList(){
+        ad.setTitle("Permission check")
+                .setCancelable(false);
+
+        ////////////////////////////////////////////////////////////
+
+        LinearLayout permissionLayout = new LinearLayout(mContext);
+        permissionLayout.setLayoutParams(new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
+        ));
+        permissionLayout.setOrientation(LinearLayout.VERTICAL);
+        permissionLayout.setBackgroundColor(Color.parseColor("#FFFFFF"));
+
+        ////////////////////////////////////////////////////////////
+
+        TextView textView = new TextView(mContext);
+        textView.setTextSize(23);
+        textView.setText("This app requires some additional permissions in order to make its job properly:");
+        textView.setLayoutParams(new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.WRAP_CONTENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
+        ));
+
+        ////////////////////////////////////////////////////////////
+
+        View space = new View(mContext);
+        space.setLayoutParams(new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                (int)convertDpToPixels(20)
+        ));
+
+        ////////////////////////////////////////////////////////////
+
+        permissionLayout.addView(textView);
+        permissionLayout.addView(space);
+
+        ScrollView scrollView = new ScrollView(mContext);
+        scrollView.setLayoutParams(new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.MATCH_PARENT
+        ));
+        LinearLayout layoutForScrollView = new LinearLayout(mContext);
+        layoutForScrollView.setLayoutParams(new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
+        ));
+        layoutForScrollView.setOrientation(LinearLayout.VERTICAL);
+        layoutForScrollView.setBackgroundColor(Color.parseColor("#FFFFFF"));
+
+        for(Map.Entry<String, ArrayList<String>> entry : permissionsMap.entrySet()){
+            layoutForScrollView.addView(permissionLine(entry.getValue()));
+        }
+
+        scrollView.addView(layoutForScrollView);
+        permissionLayout.addView(scrollView);
+
+        ad.setView(permissionLayout);
+        mPermissionsDialog = ad.create();
+        mPermissionsDialog.show();
+
+    }
+    @NonNull
+    private LinearLayout permissionLine(@NonNull final ArrayList<String> pItems){
+        LinearLayout layout = new LinearLayout(mContext);
+        layout.setOrientation(LinearLayout.HORIZONTAL);
+        layout.setBackgroundColor(Color.parseColor("#F3F3F3"));
+        layout.setMinimumHeight(48);
+        layout.setMinimumWidth(88);
+
+        LinearLayout.LayoutParams lParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
+        );
+        lParams.setMargins(3,3,3,3);
+        layout.setLayoutParams(lParams);
+
+        ////////////////////////////////////////////////////////////
+
+        TextView tv = new TextView(mContext);
+
+        LinearLayout.LayoutParams tvParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.WRAP_CONTENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
+        );
+        tvParams.setMargins(10,0,0,0);
+
+        tv.setLayoutParams(tvParams);
+        tv.setText(formatName(pItems.get(0)));
+        tv.setTextSize(20);
+        tv.setGravity(Gravity.CENTER);
+
+        ////////////////////////////////////////////////////////////
+
+        View space = new View(mContext);
+        space.setLayoutParams(new LinearLayout.LayoutParams(0,0,1));
+
+        ////////////////////////////////////////////////////////////
+
+        layout.addView(tv);
+        layout.addView(space);
+
+        ////////////////////////////////////////////////////////////
+
+        if(getPermissionStatus(pItems)){
+            ImageView checkImg = new ImageView(mContext);
+
+            LinearLayout.LayoutParams imgParams = new LinearLayout.LayoutParams(
+                    (int)convertDpToPixels(24),
+                    (int)convertDpToPixels(24)
+            );
+            imgParams.gravity = Gravity.CENTER;
+            imgParams.rightMargin = (int) convertDpToPixels(10);
+
+            checkImg.setLayoutParams(imgParams);
+            Drawable dr = new CheckDrawable();
+            checkImg.setImageDrawable(dr);
+
+            layout.addView(checkImg);
+        }
+        else
+        {
+            Button btn = new Button(mContext);
+
+            LinearLayout.LayoutParams btnParams = new LinearLayout.LayoutParams(
+                    (int) convertDpToPixels(130),
+                    (int) convertDpToPixels(40)
+            );
+            btnParams.setMargins(0,0,(int)convertDpToPixels(3),0);
+
+            btn.setLayoutParams(btnParams);
+            btn.setText("Settings...");
+            btn.setTextColor(Color.parseColor("#FFFFFF"));
+            btn.setTextSize(15);
+            btn.setGravity(Gravity.CENTER);
+            btn.setBackgroundColor(Color.parseColor("#5CD9FF"));
+            btn.setOnClickListener(new View.OnClickListener(){
+                @Override
+                public void onClick(View v) {
+                    if(pItems.contains(accessibility_key))
+                        PermissionManager.setAccessibilityServicePermission(mActivity);
+
+                    openManageExternalStorage(pItems);
+
+                    ActivityCompat.requestPermissions(mActivity, pItems.toArray(new String[0]), MY_PERMISSIONS_REQUEST);
+                    mPermissionsDialog.cancel();
+                }
+            });
+
+            layout.addView(btn);
+
+        }
+
+        ////////////////////////////////////////////////////////////
+
+        return layout;
+    }
+
+    private void openManageExternalStorage(@NonNull final ArrayList<String> pItems){
+        if(pItems.contains("android.permission.MANAGE_EXTERNAL_STORAGE") &&
+            !getPermissionStatus("android.permission.MANAGE_EXTERNAL_STORAGE")){
+                try{
+                    Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
+                    intent.addCategory("android.intent.category.DEFAULT");
+                    intent.setData(Uri.parse(String.format("package:%s", mContext.getPackageName())));
+                    mActivity.startActivity(intent);
+                } catch (Exception e) {
+                    Intent intent = new Intent();
+                    intent.setAction(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
+                    mActivity.startActivity(intent);
+                }
+            }
+    }
+
+
+
+    private float convertDpToPixels(float dp) {
+        return dp * mContext.getResources().getDisplayMetrics().density;
+    }
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/rhodes.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" packagePrefix="com.rhomobile.rhodes" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/SSLImpl.java

@@ -640,6 +640,7 @@ public class SSLImpl {
             String host = st.nextToken();
 
             SSLSocket aSock = (SSLSocket)f.createSocket(s, host, remote.port, true);
+            aSock.setEnabledProtocols(new String[] {"TLSv1", "TLSv1.1","TLSv1.2"});
             aSock.setUseClientMode(true);
 
             synchronized (this) {