moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-01-08 12:28:04 -05:00
Code Issues Releases Wiki Activity

Make sure things work and compile with JDK8

Browse Source
This commit is contained in:
Reinhard Pointner 2018-12-01 23:58:37 +07:00
parent fa491ce4c8
commit 6dab4f8036
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/net/filebot/util/PGP.java
View File

@ -2,15 +2,13 @@ package net.filebot.util;
import static java.nio.charset.StandardCharsets.*;
import static java.util.stream.Collectors.*;
import static net.filebot.util.FileUtilities.*;
import static net.filebot.util.RegularExpressions.*;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Optional;
import java.util.Scanner;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -71,14 +69,7 @@ public class PGP {
}
public static String findClearSignMessage(File file) throws IOException {
try (Scanner scanner = new Scanner(file, UTF_8)) {
Optional<MatchResult> match = scanner.findAll(PGP_SIGNED_MESSAGE).findFirst();
if (match.isPresent()) {
return match.get().group();
}
}
throw new IllegalArgumentException("PGP SIGNED MESSAGE not found");
return findClearSignMessage(readTextFile(file));
}
}