Added option to enable/disable webm.

Some lower-end devices will have problems with webm
due to problematic/outdated drivers.
captchafix
Florens Douwes 11 years ago
parent d7634b690a
commit 8c8d6cfde1
  1. 4
      Chan/res/values/strings.xml
  2. 6
      Chan/res/xml/preference.xml
  3. 4
      Chan/src/org/floens/chan/core/ChanPreferences.java
  4. 13
      Chan/src/org/floens/chan/ui/fragment/ImageViewFragment.java

@ -93,6 +93,10 @@
<string name="preference_general">General</string>
<string name="preference_open_link_confirmation">Ask before opening links</string>
<string name="preference_enable_video">Enable videos</string>
<string name="preference_enable_video_enabled">Displaying videos</string>
<string name="preference_enable_video_disabled">Not displaying videos</string>
<string name="preference_default_name">Default name</string>
<string name="preference_default_email">Default email</string>

@ -21,6 +21,12 @@
android:defaultValue="true"
android:key="preference_open_link_confirmation"
android:title="@string/preference_open_link_confirmation" />
<CheckBoxPreference
android:defaultValue="true"
android:key="preference_enable_video"
android:title="@string/preference_enable_video"
android:summaryOn="@string/preference_enable_video_enabled"
android:summaryOff="@string/preference_enable_video_disabled" />
<EditTextPreference
android:key="preference_default_name"

@ -54,6 +54,10 @@ public class ChanPreferences {
String number = ChanApplication.getPreferences().getString("preference_watch_background_timeout", "0");
return Integer.parseInt(number) * 1000L;
}
public static boolean getVideosEnabled() {
return ChanApplication.getPreferences().getBoolean("preference_enable_video", true);
}
}

@ -5,6 +5,7 @@ import java.io.IOException;
import org.floens.chan.ChanApplication;
import org.floens.chan.R;
import org.floens.chan.core.ChanPreferences;
import org.floens.chan.core.model.Post;
import org.floens.chan.core.net.CachingRequest;
import org.floens.chan.core.net.GIFRequest;
@ -97,9 +98,13 @@ public class ImageViewFragment extends Fragment implements View.OnLongClickListe
if (post.ext.equals("gif")) {
loadGif();
} else if (post.ext.equals("webm")) {
loadMovie();
if (ChanPreferences.getVideosEnabled()) {
loadMovie();
} else {
loadOtherImage(post.thumbnailUrl);
}
} else {
loadOtherImage();
loadOtherImage(post.imageUrl);
}
}
}
@ -165,11 +170,11 @@ public class ImageViewFragment extends Fragment implements View.OnLongClickListe
}
}
private void loadOtherImage() {
private void loadOtherImage(String url) {
NetworkPhotoView imageView = new NetworkPhotoView(context);
imageView.setImageViewFragment(this);
imageView.setFadeIn(100);
imageView.setImageUrl(post.imageUrl, ChanApplication.getImageLoader());
imageView.setImageUrl(url, ChanApplication.getImageLoader());
imageView.setMaxScale(3f);
imageView.setOnLongClickListenerToAttacher(this);
imageView.setOnViewTapListenerToAttacher(this);

Loading…
Cancel
Save