diff options
Diffstat (limited to 'org.fox.ttrss/src')
4 files changed, 11 insertions, 133 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index b3c0b687..a0e223a7 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -246,23 +246,6 @@ <service android:name=".widget.WidgetUpdateService" android:permission="android.permission.BIND_JOB_SERVICE" /> - <service - android:name=".DashClock" - android:icon="@drawable/dashclock" - android:label="@string/app_name" - android:exported="true" - android:permission="com.google.android.apps.dashclock.permission.READ_EXTENSION_DATA" > - <intent-filter> - <action android:name="com.google.android.apps.dashclock.Extension" /> - </intent-filter> - - <meta-data - android:name="protocolVersion" - android:value="1" /> - <meta-data - android:name="description" - android:value="@string/app_name" /> - </service> <activity android:name=".GalleryActivity" diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java index 0ccaa2e6..995e0074 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java @@ -32,6 +32,8 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; +import androidx.core.text.HtmlCompat; + import org.fox.ttrss.types.Article; import org.fox.ttrss.types.Attachment; @@ -199,7 +201,7 @@ public class ArticleFragment extends StateSavedFragment { else titleStr = m_article.title; - title.setText(Html.fromHtml(titleStr)); + title.setText(HtmlCompat.fromHtml(titleStr, HtmlCompat.FROM_HTML_MODE_LEGACY)); //title.setPaintFlags(title.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); title.setOnClickListener(new OnClickListener() { @Override @@ -490,18 +492,13 @@ public class ArticleFragment extends StateSavedFragment { String articleContent = m_article.content != null ? m_article.content : ""; - if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - ws.setJavaScriptEnabled(true); - - m_chromeClient = new FSVideoChromeClient(getView()); - m_web.setWebChromeClient(m_chromeClient); + ws.setJavaScriptEnabled(true); - if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - ws.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); - } + m_chromeClient = new FSVideoChromeClient(getView()); + m_web.setWebChromeClient(m_chromeClient); - ws.setMediaPlaybackRequiresUserGesture(true); - } + ws.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); + ws.setMediaPlaybackRequiresUserGesture(true); if (m_activity.isUiNightMode()) { m_web.setBackgroundColor(Color.BLACK); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DashClock.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DashClock.java deleted file mode 100644 index a270a9ed..00000000 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DashClock.java +++ /dev/null @@ -1,102 +0,0 @@ -package org.fox.ttrss; - -import android.content.Intent; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; - -import com.google.android.apps.dashclock.api.DashClockExtension; -import com.google.android.apps.dashclock.api.ExtensionData; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - -import org.fox.ttrss.util.SimpleLoginManager; - -import java.util.HashMap; - -public class DashClock extends DashClockExtension { - - private final String TAG = this.getClass().getSimpleName(); - - protected SharedPreferences m_prefs; - - @Override - protected void onInitialize(boolean isReconnect) { - super.onInitialize(isReconnect); - setUpdateWhenScreenOn(true); - - m_prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - } - - @Override - protected void onUpdateData(int reason) { - - SimpleLoginManager loginManager = new SimpleLoginManager() { - - @Override - protected void onLoginSuccess(int requestId, String sessionId, int apiLevel) { - - ApiRequest aru = new ApiRequest(getApplicationContext()) { - @Override - protected void onPostExecute(JsonElement result) { - if (result != null) { - try { - JsonObject content = result.getAsJsonObject(); - - if (content != null) { - int unread = content.get("unread").getAsInt(); - - ExtensionData updatedData = null; // when null DashClock hides the widget - - if (unread > 0) { - updatedData = new ExtensionData(); - updatedData.visible(true); - - updatedData.icon(R.drawable.dashclock); - updatedData.status(String.valueOf(unread)); - - updatedData.expandedTitle(getResources().getQuantityString(R.plurals.n_unread_articles, unread, unread)); - //updatedData.expandedBody(getString(R.string.app_name)); - - updatedData.clickIntent(new Intent().setClassName("org.fox.ttrss", - "org.fox.ttrss.LaunchActivity")); - } - - publishUpdate(updatedData); - - return; - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - } - }; - - final String fSessionId = sessionId; - - HashMap<String, String> umap = new HashMap<String, String>(); - umap.put("op", "getUnread"); - umap.put("sid", fSessionId); - - aru.execute(umap); - } - - @Override - protected void onLoginFailed(int requestId, ApiRequest ar) { - - } - - @Override - protected void onLoggingIn(int requestId) { - - - } - }; - - String login = m_prefs.getString("login", "").trim(); - String password = m_prefs.getString("password", "").trim(); - - loginManager.logIn(getApplicationContext(), 1, login, password); - } -} diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java index 906e2c1f..9645ad80 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java @@ -162,7 +162,7 @@ public class GalleryActivity extends CommonActivity { GalleryEntry item = new GalleryEntry(); - if ("video".equals(elem.tagName().toLowerCase())) { + if ("video".equalsIgnoreCase(elem.tagName())) { String cover = elem.attr("poster"); Element source = elem.select("source").first(); @@ -183,7 +183,7 @@ public class GalleryActivity extends CommonActivity { try { Uri checkUri = Uri.parse(src); - if (!"data".equals(checkUri.getScheme().toLowerCase())) { + if (!"data".equalsIgnoreCase(checkUri.getScheme())) { item.url = src; item.coverUrl = cover; item.type = GalleryEntry.GalleryEntryType.TYPE_VIDEO; @@ -212,7 +212,7 @@ public class GalleryActivity extends CommonActivity { try { Uri checkUri = Uri.parse(src); - if (!"data".equals(checkUri.getScheme().toLowerCase())) { + if (!"data".equalsIgnoreCase(checkUri.getScheme())) { item.url = src; item.type = GalleryEntry.GalleryEntryType.TYPE_IMAGE; } |