diff --git a/app/build.gradle b/app/build.gradle index 9c4b4265c..1e6fca21d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,7 +59,7 @@ ext.photoViewLibraryVersion = '2.0.0' ext.swipebackLibraryVersion = '1.0.3' ext.ratethisappLibraryVersion = '1.2.0' ext.uploadServiceVersion = "3.4.2" -ext.torrentstreamVersion = "2.6.1" +ext.torrentstreamVersion = "2.5.0" dependencies { @@ -88,11 +88,10 @@ dependencies { implementation 'com.github.GrenderG:Toasty:1.3.1' implementation 'com.elconfidencial.bubbleshowcase:bubbleshowcase:1.3.1' implementation 'com.android.support:multidex:1.0.3' - implementation 'com.google.android.exoplayer:exoplayer-core:2.9.3' - implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.3' - implementation "com.github.TorrentStream:TorrentStream-Android:$torrentstreamVersion" + implementation 'com.google.android.exoplayer:exoplayer:2.9.3' implementation 'com.github.stom79:android-upload-service:3.4.2-Mastalab' implementation 'com.github.mabbas007:TagsEditText:1.0.5' implementation 'com.jaredrummler:material-spinner:1.3.1' + implementation 'org.webrtc:google-webrtc:1.0.+' playstoreImplementation "io.github.kobakei:ratethisapp:$ratethisappLibraryVersion" } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/PeertubeActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/PeertubeActivity.java index 6db9b8aa9..6b6b1c060 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/PeertubeActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/PeertubeActivity.java @@ -31,7 +31,6 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.os.Environment; import android.support.v4.content.ContextCompat; import android.support.v7.app.ActionBar; import android.support.v7.widget.AppCompatImageView; @@ -56,22 +55,14 @@ import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; -import com.github.se_bastiaan.torrentstream.StreamStatus; -import com.github.se_bastiaan.torrentstream.Torrent; -import com.github.se_bastiaan.torrentstream.TorrentOptions; -import com.github.se_bastiaan.torrentstream.TorrentStream; -import com.github.se_bastiaan.torrentstream.listeners.TorrentListener; import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.source.ExtractorMediaSource; -import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection; import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; -import com.google.android.exoplayer2.trackselection.TrackSelection; import com.google.android.exoplayer2.ui.AspectRatioFrameLayout; import com.google.android.exoplayer2.ui.PlaybackControlView; import com.google.android.exoplayer2.ui.SimpleExoPlayerView; import com.google.android.exoplayer2.upstream.DataSource; -import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; import com.google.android.exoplayer2.util.Util; @@ -130,8 +121,6 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube private Peertube peertube; private TextView toolbar_title; public static String video_id; - private TorrentStream torrentStream; - private TorrentListener torrentListener; private SimpleExoPlayerView playerView; private SimpleExoPlayer player; private boolean fullScreenMode; @@ -206,6 +195,8 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube mode = sharedpreferences.getInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_DIRECT); + if( mode != Helper.VIDEO_MODE_WEBVIEW && mode != Helper.VIDEO_MODE_DIRECT) + mode = VIDEO_MODE_DIRECT; if( mode == Helper.VIDEO_MODE_WEBVIEW){ webview_video.setVisibility(View.VISIBLE); playerView.setVisibility(View.GONE); @@ -238,7 +229,13 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube } } }); + webview_video.getSettings().setAllowFileAccess(true); webview_video.setWebChromeClient(mastalabWebChromeClient); + webview_video.getSettings().setDomStorageEnabled(true); + webview_video.getSettings().setAppCacheEnabled(true); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { + webview_video.getSettings().setMediaPlaybackRequiresUserGesture(false); + } webview_video.setWebViewClient(new MastalabWebViewClient(PeertubeActivity.this)); webview_video.loadUrl("https://" + peertubeInstance + "/videos/embed/" + videoId); }else { @@ -451,69 +448,7 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube e.printStackTrace(); } - if( mode == Helper.VIDEO_MODE_TORRENT){ - TorrentOptions torrentOptions = new TorrentOptions.Builder() - .saveLocation(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)) - .removeFilesAfterStop(true) - .build(); - - - - DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter(); - TrackSelection.Factory videoTrackSelectionFactory = new AdaptiveTrackSelection.Factory(bandwidthMeter); - trackSelector = new DefaultTrackSelector(videoTrackSelectionFactory); - - DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getApplicationContext(), - Util.getUserAgent(getApplicationContext(), "Mastalab"), null); - - ExtractorMediaSource videoSource = new ExtractorMediaSource.Factory(dataSourceFactory) - .createMediaSource(Uri.parse(apiResponse.getPeertubes().get(0).getTorrentUrl(null))); - - - player = ExoPlayerFactory.newSimpleInstance(PeertubeActivity.this, trackSelector); - playerView.setPlayer(player); - torrentStream = TorrentStream.init(torrentOptions); - player.prepare(videoSource); - torrentStream.startStream(apiResponse.getPeertubes().get(0).getTorrentUrl(null)); - torrentListener = new TorrentListener() { - @Override - public void onStreamPrepared(Torrent torrent) { - } - - @Override - public void onStreamStarted(Torrent torrent) { - } - - @Override - public void onStreamError(Torrent torrent, Exception e) { - e.printStackTrace(); - } - - @Override - public void onStreamReady(Torrent torrent) { - loader.setVisibility(View.GONE); - DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getApplicationContext(), - Util.getUserAgent(getApplicationContext(), "Mastalab"), bandwidthMeter); - - ExtractorMediaSource extractorMediaSource = new ExtractorMediaSource.Factory(dataSourceFactory) - .createMediaSource(Uri.fromFile(torrent.getVideoFile())); - player.prepare(extractorMediaSource); - player.setPlayWhenReady(true); - - } - - @Override - public void onStreamProgress(Torrent torrent, StreamStatus status) { - } - - @Override - public void onStreamStopped() { - loader.setVisibility(View.GONE); - player.release(); - } - }; - torrentStream.addListener(torrentListener); - }else if( mode == Helper.VIDEO_MODE_DIRECT){ + if( mode == Helper.VIDEO_MODE_DIRECT){ DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getApplicationContext(), Util.getUserAgent(getApplicationContext(), "Mastalab"), null); @@ -670,8 +605,6 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube @Override public void onDestroy() { super.onDestroy(); - if( torrentStream != null && torrentStream.isStreaming()) - torrentStream.stopStream(); } @Override @@ -724,71 +657,7 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube PlaybackControlView controlView = playerView.findViewById(R.id.exo_controller); resolution = controlView.findViewById(R.id.resolution); resolution.setText(String.format("%sp",res)); - if (mode == Helper.VIDEO_MODE_TORRENT) { - torrentStream.stopStream(); - torrentStream.removeListener(torrentListener); - - - TorrentOptions torrentOptions = new TorrentOptions.Builder() - .saveLocation(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)) - .removeFilesAfterStop(true) - .build(); - - - DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter(); - TrackSelection.Factory videoTrackSelectionFactory = new AdaptiveTrackSelection.Factory(bandwidthMeter); - trackSelector = new DefaultTrackSelector(videoTrackSelectionFactory); - - DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getApplicationContext(), - Util.getUserAgent(getApplicationContext(), "Mastalab"), null); - - ExtractorMediaSource videoSource = new ExtractorMediaSource.Factory(dataSourceFactory) - .createMediaSource(Uri.parse(peertube.getTorrentUrl(res))); - - - player = ExoPlayerFactory.newSimpleInstance(PeertubeActivity.this, trackSelector); - playerView.setPlayer(player); - torrentStream = TorrentStream.init(torrentOptions); - torrentStream.startStream(peertube.getTorrentUrl(res)); - torrentListener = new TorrentListener() { - @Override - public void onStreamPrepared(Torrent torrent) { - resolution.setText(res); - } - - @Override - public void onStreamStarted(Torrent torrent) { - } - - @Override - public void onStreamError(Torrent torrent, Exception e) { - } - - @Override - public void onStreamReady(Torrent torrent) { - loader.setVisibility(View.GONE); - resolution.setText(res); - DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getApplicationContext(), - Util.getUserAgent(getApplicationContext(), "Mastalab"), null); - - ExtractorMediaSource videoSource = new ExtractorMediaSource.Factory(dataSourceFactory) - .createMediaSource(Uri.fromFile(torrent.getVideoFile())); - player.prepare(videoSource); - player.seekTo(0, position); - player.setPlayWhenReady(true); - } - - @Override - public void onStreamProgress(Torrent torrent, StreamStatus status) { - } - - @Override - public void onStreamStopped() { - loader.setVisibility(View.GONE); - } - }; - torrentStream.addListener(torrentListener); - }else if( mode == VIDEO_MODE_DIRECT){ + if( mode == VIDEO_MODE_DIRECT){ player = ExoPlayerFactory.newSimpleInstance(PeertubeActivity.this); playerView.setPlayer(player); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsPeertubeFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsPeertubeFragment.java index 12bf86941..e95372df1 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsPeertubeFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsPeertubeFragment.java @@ -59,7 +59,8 @@ public class SettingsPeertubeFragment extends Fragment { ArrayAdapter video_mode_spinnerAdapter = ArrayAdapter.createFromResource(getContext(), R.array.settings_video_mode, android.R.layout.simple_spinner_item); video_mode_spinner.setAdapter(video_mode_spinnerAdapter); - + if (videoMode == Helper.VIDEO_MODE_TORRENT) + videoMode = 2; video_mode_spinner.setSelection(videoMode); video_mode_spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override @@ -67,10 +68,10 @@ public class SettingsPeertubeFragment extends Fragment { if( count1 > 0 ) { SharedPreferences.Editor editor = sharedpreferences.edit(); switch (position) { - case 0: + /*case 0: editor.putInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_TORRENT); editor.apply(); - break; + break;*/ case 1: editor.putInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_WEBVIEW); editor.apply(); diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index 53336a720..d2f72f245 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -727,7 +727,6 @@ My pictures - Torrent Webview Direct stream diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 5159fd4de..02f16c412 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -741,7 +741,6 @@ My pictures - تورنت Webview تدفق مباشر diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 178bd6606..9a1565572 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -727,7 +727,6 @@ My pictures - Torrent Webview Direct stream diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index a75c8edc6..d9471af22 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -731,7 +731,6 @@ Začněte psát první znaky pro návrh.\n\n My pictures - Torrent Webview Direct stream diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 21cf46cfb..6c9fb47cf 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -742,7 +742,6 @@ My pictures - Torrent Webview Direct stream diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 53336a720..d2f72f245 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -727,7 +727,6 @@ My pictures - Torrent Webview Direct stream diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 49bd4beb7..bfdbf8fbb 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -717,7 +717,6 @@ Durch das Löschen der Anwendung werden diese Daten sofort entfernt.\n Meine Bilder - Torrent Webansicht Direkter Datenstrom diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index b8fb09a14..e92e4de64 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -727,7 +727,6 @@ My pictures - Torrent Webview Direct stream diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 899727895..d20d6d4f8 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -722,7 +722,6 @@ https://yandex.ru/legal/confidential/?lang=en My pictures - Torrent Webview Direct stream diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index ac1caff44..7f462a7d8 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -725,7 +725,6 @@ My pictures - Torrent Web ikuspegia Zuzeneko streaming-a diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index a9031052f..c12b0c296 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -727,7 +727,6 @@ My pictures - Torrent Webview Direct stream diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 53336a720..d2f72f245 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -727,7 +727,6 @@ My pictures - Torrent Webview Direct stream diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 92e674510..dd98f699d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -724,7 +724,6 @@ Le bouton de connexion s’activera une fois qu’un domaine valide sera renseig Mes images - Torrent Webview Flux direct diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index f77eb40c5..2f464096b 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -728,7 +728,7 @@ My pictures - Torrent + Vista web Fluxo directo diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 4d515bd72..9ee9d9d8e 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -735,7 +735,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 21183ba3c..296602690 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -716,7 +716,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 3a89ecfb4..b1aeed169 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -727,7 +727,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml index 3c6c10874..046d92639 100644 --- a/app/src/main/res/values-hy/strings.xml +++ b/app/src/main/res/values-hy/strings.xml @@ -726,7 +726,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index e2baaf895..33159a0e6 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -725,7 +725,7 @@ https://yandex.ru/legal/confidential/?lang=en My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a237fec61..f2634c4f9 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -727,7 +727,7 @@ Le mie immagini - Torrent + Webview Flusso diretto diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 7f2db0ce7..2d75d07d2 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -715,7 +715,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml index 9dee55ced..dea4aa175 100644 --- a/app/src/main/res/values-kab/strings.xml +++ b/app/src/main/res/values-kab/strings.xml @@ -727,7 +727,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 7b0807bc3..b3d3a5e06 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -723,7 +723,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-lmo/strings.xml b/app/src/main/res/values-lmo/strings.xml index 53336a720..72902e3a9 100644 --- a/app/src/main/res/values-lmo/strings.xml +++ b/app/src/main/res/values-lmo/strings.xml @@ -727,7 +727,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 53336a720..72902e3a9 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -727,7 +727,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 45cb51489..7cb1d262f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -724,7 +724,7 @@ Je kunt beginnen met typen en er zullen namen gesuggereerd worden.\n\n Mijn foto\'s - Torrent + Webview Directe stream diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index b15e1cee0..e204c506c 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -715,7 +715,7 @@ Adresser vil bli foreslått når du begynner å skrive.\n\n Mine bilder - Torrent + Webvisning Direktestrøm diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml index 53336a720..72902e3a9 100644 --- a/app/src/main/res/values-oc/strings.xml +++ b/app/src/main/res/values-oc/strings.xml @@ -727,7 +727,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 65ccf4d3e..a791f566f 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -729,7 +729,7 @@ My pictures - Torrent + Widok sieci Web Transmisja bezpośrednia diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index aa646f7a2..16d5fc12b 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -727,7 +727,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 6f17272b2..f08a46fa9 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -728,7 +728,7 @@ Aceste date sunt strict confidențiale și pot fi folosite doar de aplicație. My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b8c78f7c5..83def116d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -735,7 +735,7 @@ Мои изображения - Torrent + Webview Прямой поток diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index 0454c0757..7531865ab 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -726,7 +726,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index d7d2cd297..9c7861ea5 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -735,7 +735,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index c16d15b30..7fde4c3f5 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -731,7 +731,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 473d88ed2..fa0d66c17 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -727,7 +727,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 273dcfff6..d7ecfc331 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -720,7 +720,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 519653934..5024c1c61 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -725,7 +725,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 475fca2be..6d6457d22 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -721,7 +721,7 @@ và %d toots khác để khám phá My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index be9043ee2..7ca5f7f8a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -723,7 +723,7 @@ My pictures - Torrent + Webview Direct stream diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 60ececb55..a454ea9b3 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -723,7 +723,7 @@ 我的圖片 - Torrent + Webview 直接串流 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f01a3bb2a..08f8de959 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -833,7 +833,6 @@ - Torrent Webview Direct stream