15 * |
15 * |
16 */ |
16 */ |
17 |
17 |
18 package com.nokia.mj.impl.security.midp.authorization; |
18 package com.nokia.mj.impl.security.midp.authorization; |
19 |
19 |
|
20 import com.nokia.mj.impl.utils.Id; |
20 import com.nokia.mj.impl.utils.Uid; |
21 import com.nokia.mj.impl.utils.Uid; |
21 import com.nokia.mj.impl.utils.exception.InvalidAttributeException; |
22 import com.nokia.mj.impl.utils.exception.InvalidAttributeException; |
22 import com.nokia.mj.impl.security.midp.common.MIDPPermission; |
23 import com.nokia.mj.impl.security.midp.common.MIDPPermission; |
23 import com.nokia.mj.impl.security.midp.common.UserSecuritySettings; |
24 import com.nokia.mj.impl.security.midp.common.UserSecuritySettings; |
24 import com.nokia.mj.impl.security.midp.common.UserSecuritySettingsImpl; |
25 import com.nokia.mj.impl.security.midp.common.UserSecuritySettingsImpl; |
455 } |
456 } |
456 // check for sensitive combinations |
457 // check for sensitive combinations |
457 if (permissions_from_sensitive_combination_list_1 |
458 if (permissions_from_sensitive_combination_list_1 |
458 && permissions_from_sensitive_combination_list_2) |
459 && permissions_from_sensitive_combination_list_2) |
459 { |
460 { |
460 String blanketPermissionsDetails = ( |
461 /*String blanketPermissionsDetails = ( |
461 ((call_control == true && multimedia == true) |
462 ((call_control == true && multimedia == true) |
462 || (call_control == true && read_user_data == true) |
463 || (call_control == true && read_user_data == true) |
463 || (net_access == true && multimedia == true) |
464 || (net_access == true && multimedia == true) |
464 || (net_access == true && read_user_data == true) |
465 || (net_access == true && read_user_data == true) |
465 || (messaging == true && multimedia == true) |
466 || (messaging == true && multimedia == true) |
466 || (messaging == true && read_user_data == true)) ? |
467 || (messaging == true && read_user_data == true)) ? |
467 "settings_inst_query_perm_net" : |
468 "settings_inst_query_perm_net" : |
468 "settings_inst_query_perm_sec"); |
469 "settings_inst_query_perm_sec");*/ |
|
470 |
|
471 Id blanketPermissionsDetails = ( |
|
472 ((call_control == true && multimedia == true) |
|
473 || (call_control == true && read_user_data == true) |
|
474 || (net_access == true && multimedia == true) |
|
475 || (net_access == true && read_user_data == true) |
|
476 || (messaging == true && multimedia == true) |
|
477 || (messaging == true && read_user_data == true)) ? |
|
478 new Id("settings_inst_query_perm_net", "N/A") : |
|
479 new Id("settings_inst_query_perm_sec", "N/A")); |
|
480 |
469 iBlanketPermissionsDetails.put(msUidKey, |
481 iBlanketPermissionsDetails.put(msUidKey, |
470 UserSecuritySettingsImpl.getLocalizedString( |
482 UserSecuritySettingsImpl.getLocalizedString( |
471 blanketPermissionsDetails)); |
483 blanketPermissionsDetails)); |
472 } |
484 } |
473 if (blanketPermissions.size() > 0) |
485 if (blanketPermissions.size() > 0) |