Merge branch 'master' into yubikey

Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	extern/openpgp-api-lib
	settings.gradle

7 files changed, 200 insertions, 81 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
index 6c4d59a77..43ed2dad0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java
@@ -23,7 +23,13 @@ import android.content.AbstractThreadedSyncAdapter;
 import android.content.ContentProviderClient;
 import android.content.Intent;
 import android.content.SyncResult;
-import android.os.*;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.Message;
+import android.os.Messenger;
+
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.KeychainApplication;
 import org.sufficientlysecure.keychain.helper.ContactHelper;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/DummyAccountService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/DummyAccountService.java
index 008502ce7..41ff6d02b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/DummyAccountService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/DummyAccountService.java
@@ -29,6 +29,7 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.widget.Toast;
+
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.util.Log;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index 7250a861d..a7115a53d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -24,7 +24,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
-import android.os.Parcel;
 import android.os.RemoteException;
 
 import org.sufficientlysecure.keychain.Constants;
@@ -32,7 +31,6 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.helper.FileHelper;
 import org.sufficientlysecure.keychain.helper.OtherHelper;
 import org.sufficientlysecure.keychain.helper.Preferences;
-import org.sufficientlysecure.keychain.util.FileImportCache;
 import org.sufficientlysecure.keychain.keyimport.HkpKeyserver;
 import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
 import org.sufficientlysecure.keychain.keyimport.KeybaseKeyserver;
@@ -56,6 +54,7 @@ import org.sufficientlysecure.keychain.provider.KeychainDatabase;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.service.OperationResults.EditKeyResult;
 import org.sufficientlysecure.keychain.service.OperationResults.ImportKeyResult;
+import org.sufficientlysecure.keychain.util.FileImportCache;
 import org.sufficientlysecure.keychain.util.InputData;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.ProgressScaler;
@@ -63,11 +62,9 @@ import org.sufficientlysecure.keychain.util.ProgressScaler;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -110,8 +107,10 @@ public class KeychainIntentService extends IntentService
     public static final String SOURCE = "source";
     // possible targets:
     public static final int IO_BYTES = 1;
-    public static final int IO_FILE = 2; // This was misleadingly TARGET_URI before!
-    public static final int IO_URI = 3;
+    public static final int IO_URI = 2;
+    public static final int IO_URIS = 3;
+
+    public static final String SELECTED_URI = "selected_uri";
 
     // encrypt
     public static final String ENCRYPT_SIGNATURE_KEY_ID = "secret_key_id";
@@ -121,8 +120,10 @@ public class KeychainIntentService extends IntentService
     public static final String ENCRYPT_MESSAGE_BYTES = "message_bytes";
     public static final String ENCRYPT_INPUT_FILE = "input_file";
     public static final String ENCRYPT_INPUT_URI = "input_uri";
+    public static final String ENCRYPT_INPUT_URIS = "input_uris";
     public static final String ENCRYPT_OUTPUT_FILE = "output_file";
     public static final String ENCRYPT_OUTPUT_URI = "output_uri";
+    public static final String ENCRYPT_OUTPUT_URIS = "output_uris";
     public static final String ENCRYPT_SYMMETRIC_PASSPHRASE = "passphrase";
 
     // decrypt/verify
@@ -142,6 +143,7 @@ public class KeychainIntentService extends IntentService
     // export key
     public static final String EXPORT_OUTPUT_STREAM = "export_output_stream";
     public static final String EXPORT_FILENAME = "export_filename";
+    public static final String EXPORT_URI = "export_uri";
     public static final String EXPORT_SECRET = "export_secret";
     public static final String EXPORT_ALL = "export_all";
     public static final String EXPORT_KEY_RING_MASTER_KEY_ID = "export_key_ring_id";
@@ -226,6 +228,7 @@ public class KeychainIntentService extends IntentService
             try {
                 /* Input */
                 int source = data.get(SOURCE) != null ? data.getInt(SOURCE) : data.getInt(TARGET);
+                Bundle resultData = new Bundle();
 
                 long signatureKeyId = data.getLong(ENCRYPT_SIGNATURE_KEY_ID);
                 String symmetricPassphrase = data.getString(ENCRYPT_SYMMETRIC_PASSPHRASE);
@@ -233,43 +236,47 @@ public class KeychainIntentService extends IntentService
                 boolean useAsciiArmor = data.getBoolean(ENCRYPT_USE_ASCII_ARMOR);
                 long encryptionKeyIds[] = data.getLongArray(ENCRYPT_ENCRYPTION_KEYS_IDS);
                 int compressionId = data.getInt(ENCRYPT_COMPRESSION_ID);
-                InputData inputData = createEncryptInputData(data);
-                OutputStream outStream = createCryptOutputStream(data);
-
-                /* Operation */
-                PgpSignEncrypt.Builder builder =
-                        new PgpSignEncrypt.Builder(
-                                new ProviderHelper(this),
-                                PgpHelper.getFullVersion(this),
-                                inputData, outStream);
-                builder.setProgressable(this);
+                int urisCount = data.containsKey(ENCRYPT_INPUT_URIS) ? data.getParcelableArrayList(ENCRYPT_INPUT_URIS).size() : 1;
+                for (int i = 0; i < urisCount; i++) {
+                    data.putInt(SELECTED_URI, i);
+                    InputData inputData = createEncryptInputData(data);
+                    OutputStream outStream = createCryptOutputStream(data);
+
+                    /* Operation */
+                    PgpSignEncrypt.Builder builder =
+                            new PgpSignEncrypt.Builder(
+                                    new ProviderHelper(this),
+                                    PgpHelper.getFullVersion(this),
+                                    inputData, outStream);
+                    builder.setProgressable(this);
+
+                    builder.setEnableAsciiArmorOutput(useAsciiArmor)
+                            .setCompressionId(compressionId)
+                            .setSymmetricEncryptionAlgorithm(
+                                    Preferences.getPreferences(this).getDefaultEncryptionAlgorithm())
+                            .setEncryptionMasterKeyIds(encryptionKeyIds)
+                            .setSymmetricPassphrase(symmetricPassphrase)
+                            .setSignatureMasterKeyId(signatureKeyId)
+                            .setEncryptToSigner(true)
+                            .setSignatureHashAlgorithm(
+                                    Preferences.getPreferences(this).getDefaultHashAlgorithm())
+                            .setSignaturePassphrase(
+                                    PassphraseCacheService.getCachedPassphrase(this, signatureKeyId));
+
+                    // this assumes that the bytes are cleartext (valid for current implementation!)
+                    if (source == IO_BYTES) {
+                        builder.setCleartextInput(true);
+                    }
 
-                builder.setEnableAsciiArmorOutput(useAsciiArmor)
-                        .setCompressionId(compressionId)
-                        .setSymmetricEncryptionAlgorithm(
-                                Preferences.getPreferences(this).getDefaultEncryptionAlgorithm())
-                        .setEncryptionMasterKeyIds(encryptionKeyIds)
-                        .setSymmetricPassphrase(symmetricPassphrase)
-                        .setSignatureMasterKeyId(signatureKeyId)
-                        .setEncryptToSigner(true)
-                        .setSignatureHashAlgorithm(
-                                Preferences.getPreferences(this).getDefaultHashAlgorithm())
-                        .setSignaturePassphrase(
-                                PassphraseCacheService.getCachedPassphrase(this, signatureKeyId));
-
-                // this assumes that the bytes are cleartext (valid for current implementation!)
-                if (source == IO_BYTES) {
-                    builder.setCleartextInput(true);
-                }
+                    builder.build().execute();
 
-                builder.build().execute();
+                    outStream.close();
 
-                outStream.close();
+                    /* Output */
 
-                /* Output */
+                    finalizeEncryptOutputStream(data, resultData, outStream);
 
-                Bundle resultData = new Bundle();
-                finalizeEncryptOutputStream(data, resultData, outStream);
+                }
 
                 OtherHelper.logDebugBundle(resultData, "resultData");
 
@@ -415,13 +422,16 @@ public class KeychainIntentService extends IntentService
                 boolean exportSecret = data.getBoolean(EXPORT_SECRET, false);
                 long[] masterKeyIds = data.getLongArray(EXPORT_KEY_RING_MASTER_KEY_ID);
                 String outputFile = data.getString(EXPORT_FILENAME);
+                Uri outputUri = data.getParcelable(EXPORT_URI);
 
                 // If not exporting all keys get the masterKeyIds of the keys to export from the intent
                 boolean exportAll = data.getBoolean(EXPORT_ALL);
 
-                // check if storage is ready
-                if (!FileHelper.isStorageMounted(outputFile)) {
-                    throw new PgpGeneralException(getString(R.string.error_external_storage_not_ready));
+                if (outputFile != null) {
+                    // check if storage is ready
+                    if (!FileHelper.isStorageMounted(outputFile)) {
+                        throw new PgpGeneralException(getString(R.string.error_external_storage_not_ready));
+                    }
                 }
 
                 ArrayList<Long> publicMasterKeyIds = new ArrayList<Long>();
@@ -453,12 +463,19 @@ public class KeychainIntentService extends IntentService
                     }
                 }
 
+                OutputStream outStream;
+                if (outputFile != null) {
+                    outStream = new FileOutputStream(outputFile);
+                } else {
+                    outStream = getContentResolver().openOutputStream(outputUri);
+                }
+
                 PgpImportExport pgpImportExport = new PgpImportExport(this, this, this);
                 Bundle resultData = pgpImportExport
                         .exportKeyRings(publicMasterKeyIds, secretMasterKeyIds,
-                                new FileOutputStream(outputFile));
+                                outStream);
 
-                if (mIsCanceled) {
+                if (mIsCanceled && outputFile != null) {
                     new File(outputFile).delete();
                 }
 
@@ -694,22 +711,17 @@ public class KeychainIntentService extends IntentService
                 byte[] bytes = data.getByteArray(bytesName);
                 return new InputData(new ByteArrayInputStream(bytes), bytes.length);
 
-            case IO_FILE: /* encrypting file */
-                String inputFile = data.getString(ENCRYPT_INPUT_FILE);
-
-                // check if storage is ready
-                if (!FileHelper.isStorageMounted(inputFile)) {
-                    throw new PgpGeneralException(getString(R.string.error_external_storage_not_ready));
-                }
-
-                return new InputData(new FileInputStream(inputFile), new File(inputFile).length());
-
             case IO_URI: /* encrypting content uri */
                 Uri providerUri = data.getParcelable(ENCRYPT_INPUT_URI);
 
                 // InputStream
-                InputStream in = getContentResolver().openInputStream(providerUri);
-                return new InputData(in, 0);
+                return new InputData(getContentResolver().openInputStream(providerUri), FileHelper.getFileSize(this, providerUri, 0));
+
+            case IO_URIS:
+                providerUri = data.<Uri>getParcelableArrayList(ENCRYPT_INPUT_URIS).get(data.getInt(SELECTED_URI));
+
+                // InputStream
+                return new InputData(getContentResolver().openInputStream(providerUri), FileHelper.getFileSize(this, providerUri, 0));
 
             default:
                 throw new PgpGeneralException("No target choosen!");
@@ -722,23 +734,16 @@ public class KeychainIntentService extends IntentService
             case IO_BYTES:
                 return new ByteArrayOutputStream();
 
-            case IO_FILE:
-                String outputFile = data.getString(ENCRYPT_OUTPUT_FILE);
-
-                // check if storage is ready
-                if (!FileHelper.isStorageMounted(outputFile)) {
-                    throw new PgpGeneralException(
-                            getString(R.string.error_external_storage_not_ready));
-                }
-
-                // OutputStream
-                return new FileOutputStream(outputFile);
-
             case IO_URI:
                 Uri providerUri = data.getParcelable(ENCRYPT_OUTPUT_URI);
 
                 return getContentResolver().openOutputStream(providerUri);
 
+            case IO_URIS:
+                providerUri = data.<Uri>getParcelableArrayList(ENCRYPT_OUTPUT_URIS).get(data.getInt(SELECTED_URI));
+
+                return getContentResolver().openOutputStream(providerUri);
+
             default:
                 throw new PgpGeneralException("No target choosen!");
         }
@@ -759,11 +764,8 @@ public class KeychainIntentService extends IntentService
                 byte output[] = ((ByteArrayOutputStream) outStream).toByteArray();
                 resultData.putByteArray(bytesName, output);
                 break;
-            case IO_FILE:
-                // nothing, file was written, just send okay and verification bundle
-
-                break;
             case IO_URI:
+            case IO_URIS:
                 // nothing, output was written, just send okay and verification bundle
 
                 break;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
index c27b3f6da..d7d98fd68 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package org.sufficientlysecure.keychain.service;
 
 import android.app.Activity;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
index 11829e7b8..543b83edb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResults.java
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package org.sufficientlysecure.keychain.service;
 
 import android.app.Activity;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index 97d92dbf7..e813ca26c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -34,9 +34,8 @@ import android.os.IBinder;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
-
-import android.support.v4.util.LongSparseArray;
 import android.support.v4.app.NotificationCompat;
+import android.support.v4.util.LongSparseArray;
 
 import org.spongycastle.bcpg.S2K;
 import org.sufficientlysecure.keychain.Constants;
@@ -396,8 +395,8 @@ public class PassphraseCacheService extends Service {
         } else {
             // Fallback, since expandable notifications weren't available back then
             builder.setSmallIcon(R.drawable.ic_launcher)
-                    .setContentTitle(String.format(getString(R.string.passp_cache_notif_n_keys,
-                            mPassphraseCache.size())))
+                    .setContentTitle(String.format(getString(R.string.passp_cache_notif_n_keys),
+                            mPassphraseCache.size()))
                     .setContentText(getString(R.string.passp_cache_notif_click_to_clear));
 
             Intent intent = new Intent(getApplicationContext(), PassphraseCacheService.class);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
index 5e90b396e..490a8e738 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package org.sufficientlysecure.keychain.service;
 
 import android.os.Parcel;
@@ -6,16 +23,17 @@ import android.os.Parcelable;
 import java.io.Serializable;
 import java.util.ArrayList;
 
-/** This class is a a transferable representation for a collection of changes
+/**
+ * This class is a a transferable representation for a collection of changes
  * to be done on a keyring.
- *
+ * <p/>
  * This class should include all types of operations supported in the backend.
- *
+ * <p/>
  * All changes are done in a differential manner. Besides the two key
  * identification attributes, all attributes may be null, which indicates no
  * change to the keyring. This is also the reason why boxed values are used
  * instead of primitives in the subclasses.
- *
+ * <p/>
  * Application of operations in the backend should be fail-fast, which means an
  * error in any included operation (for example revocation of a non-existent
  * subkey) will cause the operation as a whole to fail.
@@ -65,12 +83,23 @@ public class SaveKeyringParcel implements Parcelable {
         public int mKeysize;
         public int mFlags;
         public Long mExpiry;
+
         public SubkeyAdd(int algorithm, int keysize, int flags, Long expiry) {
             mAlgorithm = algorithm;
             mKeysize = keysize;
             mFlags = flags;
             mExpiry = expiry;
         }
+
+        @Override
+        public String toString() {
+            String out = "mAlgorithm: " + mAlgorithm + ", ";
+            out += "mKeysize: " + mKeysize + ", ";
+            out += "mFlags: " + mFlags;
+            out += "mExpiry: " + mExpiry;
+
+            return out;
+        }
     }
 
     public static class SubkeyChange implements Serializable {
@@ -78,11 +107,46 @@ public class SaveKeyringParcel implements Parcelable {
         public Integer mFlags;
         // this is a long unix timestamp, in seconds (NOT MILLISECONDS!)
         public Long mExpiry;
+
+        public SubkeyChange(long keyId) {
+            mKeyId = keyId;
+        }
+
         public SubkeyChange(long keyId, Integer flags, Long expiry) {
             mKeyId = keyId;
             mFlags = flags;
             mExpiry = expiry;
         }
+
+        @Override
+        public String toString() {
+            String out = "mKeyId: " + mKeyId + ", ";
+            out += "mFlags: " + mFlags + ", ";
+            out += "mExpiry: " + mExpiry;
+
+            return out;
+        }
+    }
+
+    public SubkeyChange getSubkeyChange(long keyId) {
+        for (SubkeyChange subkeyChange : mChangeSubKeys) {
+            if (subkeyChange.mKeyId == keyId) {
+                return subkeyChange;
+            }
+        }
+        return null;
+    }
+
+    public SubkeyChange getOrCreateSubkeyChange(long keyId) {
+        SubkeyChange foundSubkeyChange = getSubkeyChange(keyId);
+        if (foundSubkeyChange != null) {
+            return foundSubkeyChange;
+        } else {
+            // else, create a new one
+            SubkeyChange newSubkeyChange = new SubkeyChange(keyId);
+            mChangeSubKeys.add(newSubkeyChange);
+            return newSubkeyChange;
+        }
     }
 
     public SaveKeyringParcel(Parcel source) {
@@ -104,7 +168,7 @@ public class SaveKeyringParcel implements Parcelable {
     @Override
     public void writeToParcel(Parcel destination, int flags) {
         destination.writeInt(mMasterKeyId == null ? 0 : 1);
-        if(mMasterKeyId != null) {
+        if (mMasterKeyId != null) {
             destination.writeLong(mMasterKeyId);
         }
         destination.writeByteArray(mFingerprint);
@@ -136,4 +200,17 @@ public class SaveKeyringParcel implements Parcelable {
         return 0;
     }
 
+    @Override
+    public String toString() {
+        String out = "mMasterKeyId: " + mMasterKeyId + "\n";
+        out += "mNewPassphrase: " + mNewPassphrase + "\n";
+        out += "mAddUserIds: " + mAddUserIds + "\n";
+        out += "mAddSubKeys: " + mAddSubKeys + "\n";
+        out += "mChangeSubKeys: " + mChangeSubKeys + "\n";
+        out += "mChangePrimaryUserId: " + mChangePrimaryUserId + "\n";
+        out += "mRevokeUserIds: " + mRevokeUserIds + "\n";
+        out += "mRevokeSubKeys: " + mRevokeSubKeys;
+
+        return out;
+    }
 }