archive/conversations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small bugfixes

Browse source
This commit is contained in:
lookshe 2016-03-12 15:04:07 +01:00
parent e72f409197
commit 3dc635c6fd
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/entities/Message.java
View file

@ -470,6 +470,9 @@ public class Message extends AbstractEntity {
} }
private String extractRelevantExtension(URL url) { private String extractRelevantExtension(URL url) {
if (url == null) {
return null;
}
String path = url.getPath(); String path = url.getPath();
return extractRelevantExtension(path); return extractRelevantExtension(path);
} }

2
src/main/java/eu/siacs/conversations/utils/FileUtils.java
View file

@ -167,7 +167,7 @@ public class FileUtils {
final int lastDotPosition = filename.lastIndexOf('.'); final int lastDotPosition = filename.lastIndexOf('.');
final int secondToLastDotPosition = filename.lastIndexOf('.', lastDotPosition - 1); final int secondToLastDotPosition = filename.lastIndexOf('.', lastDotPosition - 1);
final String secondToLastPart = secondToLastDotPosition != -1 ? final String secondToLastPart = secondToLastDotPosition != -1 ?
filename.substring(secondToLastDotPosition + 1, lastDotPosition - 1) : ""; filename.substring(secondToLastDotPosition + 1, lastDotPosition) : "";
return secondToLastPart; return secondToLastPart;
} }
} }