From 4eac54c6dcd83c89bc2d80b4c86d2ae4b118c4e4 Mon Sep 17 00:00:00 2001
From: massimiliano <massimiliano@disroot.org>
Date: Wed, 7 Nov 2018 20:27:58 +0100
Subject: [PATCH] Edited main activity to open lufi external as workaround
---
.idea/caches/build_file_checksums.ser | Bin 534 -> 534 bytes
.../disroot/disrootapp/ui/MainActivity.java | 20 +++++++++---------
app/src/main/res/xml/changelog_master.xml | 1 +
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 551b1c375041a7dba43fbdac3373b0666628e727..68cdd96c5a6a2f80463a0bb0ed3d83feeadf1c75 100644
GIT binary patch
delta 15
XcmbQnGL2=z43_s3X7p{GQ^g1XG;RjY
delta 15
XcmbQnGL2=z43=Ho#Yr3IR51boEolYA
diff --git a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
index 08693c0..b32d063 100644
--- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
@@ -388,10 +388,15 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
firstStart.edit().putBoolean("firsttap", false).apply();
return;
}
- else
- webView.loadUrl(Constants.URL_DisApp_UPLOAD);
- webView.setVisibility(View.VISIBLE);
- dashboard.setVisibility(View.GONE);
+ else {
+ Uri uri = Uri.parse(Constants.URL_DisApp_UPLOAD);
+ Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+ 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
return super.onOptionsItemSelected(item);
}
}
- public CookieManager getCookieManager() {
- return cookieManager;
- }
private void setupWebView(Bundle savedInstanceState, FrameLayout customViewContainer) {
disWebChromeClient = new DisWebChromeClient(webView, customViewContainer);
@@ -1303,7 +1305,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
}
@Override
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);
return super.shouldOverrideUrlLoading(view, url);
}
@@ -1313,8 +1315,6 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
return true;
}
}
-
-
});
}
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index c0c7d82..67edd9e 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -3,6 +3,7 @@
<release version="1.0.1" versioncode="11" >
<change>Added Store cookies</change>
<cange>Added clear cache</cange>
+ <cange>Workaround for app crashing when uploading in Lufi</cange>
</release>
<release version="1.0.0" versioncode="10" >
<change>Added Serbian translation</change>
--
GitLab