Skip to content
Snippets Groups Projects
Commit 4eac54c6 authored by Massimiliano's avatar Massimiliano
Browse files

Edited main activity to open lufi external as workaround

parent a1c557ef
Branches
Tags
No related merge requests found
No preview for this file type
...@@ -388,10 +388,15 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL ...@@ -388,10 +388,15 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
firstStart.edit().putBoolean("firsttap", false).apply(); firstStart.edit().putBoolean("firsttap", false).apply();
return; return;
} }
else else {
webView.loadUrl(Constants.URL_DisApp_UPLOAD); Uri uri = Uri.parse(Constants.URL_DisApp_UPLOAD);
webView.setVisibility(View.VISIBLE); Intent intent = new Intent(Intent.ACTION_VIEW, uri);
dashboard.setVisibility(View.GONE); startActivity(intent);
}
//workaround for crashing app
// webView.loadUrl(Constants.URL_DisApp_UPLOAD);
// webView.setVisibility(View.VISIBLE);
// dashboard.setVisibility(View.GONE);
} }
}); });
...@@ -1207,9 +1212,6 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL ...@@ -1207,9 +1212,6 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
} }
public CookieManager getCookieManager() {
return cookieManager;
}
private void setupWebView(Bundle savedInstanceState, FrameLayout customViewContainer) { private void setupWebView(Bundle savedInstanceState, FrameLayout customViewContainer) {
disWebChromeClient = new DisWebChromeClient(webView, customViewContainer); disWebChromeClient = new DisWebChromeClient(webView, customViewContainer);
...@@ -1303,7 +1305,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL ...@@ -1303,7 +1305,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
} }
@Override @Override
public boolean shouldOverrideUrlLoading(WebView view, String url) { public boolean shouldOverrideUrlLoading(WebView view, String url) {
if(url.startsWith("https")|url.startsWith("http")&&url.contains("disroot")) { if(url.startsWith("https")|url.startsWith("http")&&url.contains("disroot")&!url.contains("upload.disroot.org")) {
view.loadUrl(url); view.loadUrl(url);
return super.shouldOverrideUrlLoading(view, url); return super.shouldOverrideUrlLoading(view, url);
} }
...@@ -1313,8 +1315,6 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL ...@@ -1313,8 +1315,6 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
return true; return true;
} }
} }
}); });
} }
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<release version="1.0.1" versioncode="11" > <release version="1.0.1" versioncode="11" >
<change>Added Store cookies</change> <change>Added Store cookies</change>
<cange>Added clear cache</cange> <cange>Added clear cache</cange>
<cange>Workaround for app crashing when uploading in Lufi</cange>
</release> </release>
<release version="1.0.0" versioncode="10" > <release version="1.0.0" versioncode="10" >
<change>Added Serbian translation</change> <change>Added Serbian translation</change>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment