Skip to content

Upgrade and fixes #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxvandop-mendix merged 1 commit into from
Mar 29, 2021
Merged

Upgrade and fixes #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified src/EmailModuleWithTemplates/Email module with templates.mpr
View file
Open in desktop
Binary file not shown.
Binary file modified src/EmailModuleWithTemplates/Email module with templates.mpr.bak
View file
Open in desktop
Binary file not shown.
9 changes: 6 additions & 3 deletions src/EmailModuleWithTemplates/javasource/encryption/pgp/PGPUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,14 +214,17 @@ public static void decryptFile( InputStream in, OutputStream out, InputStream ke
//
// find the secret key
//
Iterator<PGPPublicKeyEncryptedData> it = enc.getEncryptedDataObjects();
Iterator<PGPEncryptedData> it = enc.getEncryptedDataObjects();
PGPPrivateKey sKey = null;
PGPPublicKeyEncryptedData pbe = null;

while( sKey == null && it.hasNext() ) {
pbe = it.next();
PGPEncryptedData data = it.next();
if (data instanceof PGPPublicKeyEncryptedData) {
pbe = (PGPPublicKeyEncryptedData) data;

sKey = findPrivateKey(keyIn, pbe.getKeyID(), passwd);
sKey = findPrivateKey(keyIn, pbe.getKeyID(), passwd);
}
}

if ( sKey == null ) {
Expand Down
1 change: 0 additions & 1 deletion src/EmailModuleWithTemplates/javasource/mxmodelreflection/actions/ReplaceToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
package mxmodelreflection.actions;

import mxmodelreflection.TokenReplacer;
import com.mendix.core.Core;
import com.mendix.systemwideinterfaces.core.IMendixObject;
import com.mendix.systemwideinterfaces.core.IContext;
import com.mendix.webui.CustomJavaAction;
Expand Down
13 changes: 7 additions & 6 deletions src/EmailModuleWithTemplates/javasource/mxmodelreflection/actions/TestThePattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,15 @@

package mxmodelreflection.actions;

import mxmodelreflection.DataParser;
import mxmodelreflection.proxies.AttributeTypes;
import mxmodelreflection.proxies.TestPattern;
import mxmodelreflection.proxies.Token;
import com.mendix.systemwideinterfaces.MendixRuntimeException;
import com.mendix.systemwideinterfaces.core.IContext;
import com.mendix.systemwideinterfaces.core.IMendixObject;
import com.mendix.systemwideinterfaces.core.IMendixObjectMember;
import com.mendix.webui.CustomJavaAction;
import com.mendix.webui.FeedbackHelper;
import com.mendix.systemwideinterfaces.core.IMendixObject;
import java.util.Optional;
import mxmodelreflection.DataParser;
import mxmodelreflection.proxies.AttributeTypes;
import mxmodelreflection.proxies.TestPattern;

public class TestThePattern extends CustomJavaAction<java.lang.Boolean>
{
Expand Down Expand Up @@ -66,6 +65,8 @@ public java.lang.Boolean executeAction() throws Exception
case IntegerType:
memberName = TestPattern.MemberNames.IntegerAttribute;
break;
default:
throw new MendixRuntimeException("Unsupported Type : "+attributeType);
}

if (memberName != null) {
Expand Down
Binary file removed src/EmailModuleWithTemplates/userlib/bcpg-jdk15on-164.jar
View file
Open in desktop
Binary file not shown.
Binary file added src/EmailModuleWithTemplates/userlib/bcpg-jdk15on-167.jar
View file
Open in desktop
Binary file not shown.
0 ...tes/userlib/bcpg-jdk15on-164.jar.Required → .../bcpg-jdk15on-167.jar.Encryption.Required
View file
Open in desktop
File renamed without changes.
Binary file renamed ...hTemplates/userlib/bcpkix-jdk15on-164.jar → ...hTemplates/userlib/bcpkix-jdk15on-167.jar
View file
Open in desktop
Binary file not shown.
0 ...s/userlib/bcpkix-jdk15on-164.jar.Required → ...cpkix-jdk15on-167.jar.Encryption.Required
View file
Open in desktop
File renamed without changes.
Binary file renamed ...hTemplates/userlib/bcprov-jdk15on-164.jar → ...hTemplates/userlib/bcprov-jdk15on-167.jar
View file
Open in desktop
Binary file not shown.
0 ...s/userlib/bcprov-jdk15on-164.jar.Required → ...cprov-jdk15on-167.jar.Encryption.Required
View file
Open in desktop
File renamed without changes.
Empty file added src/EmailModuleWithTemplates/userlib/commons-io-2.6.jar.Encryption.Required
View file
Open in desktop
Empty file.