sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Caesar2011
2018-10-15 13:52:34 +02:00
parent 1130b57022 b244778c4a
commit e1de122001
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailResourceFragment.java
View File

@@ -27,6 +27,7 @@ import de.sebse.fuplanner.R;
import de.sebse.fuplanner.services.KVV.KVV;
import de.sebse.fuplanner.services.KVV.types.Modules;
import de.sebse.fuplanner.services.KVV.types.Resource;
import de.sebse.fuplanner.tools.Regex;
import de.sebse.fuplanner.tools.UtilsDate;
import de.sebse.fuplanner.tools.logging.Logger;
import de.sebse.fuplanner.tools.ui.treeview.DirectoryNodeBinder;
@@ -181,7 +182,14 @@ public class ModDetailResourceFragment extends Fragment {
AlertDialog alertDialog = alertDialogBuilder.create();
alertDialog.show();
}else {
fileOpen(new File(success1));
if (Regex.has("^http", success1)){
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(success1));
startActivity(intent);
}
else {
fileOpen(new File(success1));
}
}
}, error -> {

10
app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java
View File

@@ -544,10 +544,18 @@ class KVVModuleList extends HTTPService {
errorCallback.onError(new NetworkError(101701, 500, "Currently running in offline mode!"));
return;
}
get(url, token.getCookies(), response ->{
final String[] pfad = {""};
if (response.getBytes()==null){
if (Regex.has("\\.[Uu][Rr][Ll]$", url)){//für Links
if (response.getHeaders().get("Location") != null){
pfad[0] = response.getHeaders().get("Location");
}
callback.onResponse(pfad[0]);
}
else if (response.getBytes()==null){
log.d("ResourceFile neu einlogen");
testLogin(token, token -> {
if (isExternalStorageWritable()) {

4
app/src/main/java/de/sebse/fuplanner/tools/Regex.java
View File

@@ -8,10 +8,12 @@ import java.util.regex.MatchResult;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import de.sebse.fuplanner.tools.logging.Logger;
public class Regex {
public static boolean has(@Language("Regexp") String regex, String match) {
try {
regex(regex, match, 1);
regex(regex, match, 0);
return true;
} catch (NoSuchFieldException e) {
return false;