* #40232: Restore security ui.
Custom File Explorer dialog has been dropped, we will delegate this action to
third party app, or to the Storage Application Framework (new in API 19).
diff --git a/src/org/sflphone/client/AccountEditionActivity.java b/src/org/sflphone/client/AccountEditionActivity.java
index e634506..2c39ba5 100644
--- a/src/org/sflphone/client/AccountEditionActivity.java
+++ b/src/org/sflphone/client/AccountEditionActivity.java
@@ -72,7 +72,6 @@
AdvancedAccountFragment.Callbacks, SecurityAccountFragment.Callbacks, NestedSettingsFragment.Callbacks {
private static final String TAG = AccountEditionActivity.class.getSimpleName();
- public static final String KEY_MODE = "mode";
private boolean mBound = false;
private ISipService service;
private Account acc_selected;
@@ -205,6 +204,11 @@
return true;
}
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ }
+
private void processAccount() {
try {
service.setCredentials(acc_selected.getAccountID(), acc_selected.getCredentialsHashMapList());
@@ -215,24 +219,6 @@
}
- public boolean validateAccountCreation(ArrayList<String> missingValue) {
- boolean valid = true;
- ArrayList<String> requiredFields = new ArrayList<String>();
- requiredFields.add(AccountDetailBasic.CONFIG_ACCOUNT_ALIAS);
- requiredFields.add(AccountDetailBasic.CONFIG_ACCOUNT_HOSTNAME);
- requiredFields.add(AccountDetailBasic.CONFIG_ACCOUNT_USERNAME);
- requiredFields.add(AccountDetailBasic.CONFIG_ACCOUNT_PASSWORD);
- for (String s : requiredFields) {
-
- if (acc_selected.getBasicDetails().getDetailString(s).isEmpty()) {
- valid = false;
- missingValue.add(s);
- }
- }
-
- return valid;
- }
-
private AlertDialog createDeleteDialog() {
Activity ownerActivity = this;
AlertDialog.Builder builder = new AlertDialog.Builder(ownerActivity);