vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-11-22 04:12:08 +01:00
Code Issues Releases Wiki Activity

Load README when ow pod URL gets called and no pod selected , fixes #193

Browse source
This commit is contained in:
Gregor Santner 2018-04-08 18:05:56 +02:00
parent 51093e0c3d
commit 68be2f3a4a
No known key found for this signature in database
GPG key ID: 7E83A7834AECB009
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
View file

@ -333,19 +333,26 @@ public class MainActivity extends ThemedActivity
*/ */
public void openDiasporaUrl(final String url) { public void openDiasporaUrl(final String url) {
AppLog.v(this, "openDiasporaUrl()"); AppLog.v(this, "openDiasporaUrl()");
if (url.startsWith(_appSettings.getPod().getPodUrl().getBaseUrl()) && !url.startsWith("https://dia.so/")) { if (url != null && url.startsWith("http://127.0.0.1")) {
// This URL seems to be called somehow, but it doesn't make sense ;)
toolbarTop.postDelayed(() -> {
Intent i = new Intent(ACTION_OPEN_EXTERNAL_URL);
i.putExtra(EXTRA_URL, "https://github.com/Diaspora-for-Android/dandelion/blob/master/README.md");
LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(i);
}, 1000);
return;
}
if (_appSettings.getPod() != null && _appSettings.getPod().getPodUrl() != null && _appSettings.getPod().getPodUrl().getBaseUrl() != null
&& url.startsWith(_appSettings.getPod().getPodUrl().getBaseUrl()) && !url.startsWith("https://dia.so/")) {
DiasporaStreamFragment streamFragment = (DiasporaStreamFragment) getFragment(DiasporaStreamFragment.TAG); DiasporaStreamFragment streamFragment = (DiasporaStreamFragment) getFragment(DiasporaStreamFragment.TAG);
showFragment(streamFragment); showFragment(streamFragment);
showLastVisitedTimestampMessageIfNeeded(url); showLastVisitedTimestampMessageIfNeeded(url);
streamFragment.loadUrl(url); streamFragment.loadUrl(url);
} else { } else {
toolbarTop.postDelayed(new Runnable() { toolbarTop.postDelayed(() -> {
@Override
public void run() {
Intent i = new Intent(ACTION_OPEN_EXTERNAL_URL); Intent i = new Intent(ACTION_OPEN_EXTERNAL_URL);
i.putExtra(EXTRA_URL, url); i.putExtra(EXTRA_URL, url);
LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(i); LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(i);
}
}, 1000); }, 1000);
} }
} }

2
app/src/main/java/com/github/dfa/diaspora_android/web/custom_tab/CustomTabsHelper.java
View file

@ -108,6 +108,8 @@ public class CustomTabsHelper {
sPackageNameToUse = CHROMIUM; sPackageNameToUse = CHROMIUM;
} else if (packagesSupportingCustomTabs.contains(FENNEC)) { } else if (packagesSupportingCustomTabs.contains(FENNEC)) {
sPackageNameToUse = FENNEC; sPackageNameToUse = FENNEC;
}else if (packagesSupportingCustomTabs.contains(KLAR)) {
sPackageNameToUse = KLAR;
} }
return sPackageNameToUse; return sPackageNameToUse;
} }