Skip to content

Commit 1164ea5

Browse files
wb9688Stypox
authored andcommitted
Move Stored(File|Directory)Helper into NewPipe
1 parent 0f75024 commit 1164ea5

18 files changed

+269
-184
lines changed

app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
import org.schabi.newpipe.extractor.stream.SubtitlesStream;
5050
import org.schabi.newpipe.extractor.stream.VideoStream;
5151
import org.schabi.newpipe.settings.NewPipeSettings;
52+
import org.schabi.newpipe.streams.io.StoredDirectoryHelper;
53+
import org.schabi.newpipe.streams.io.StoredFileHelper;
5254
import org.schabi.newpipe.util.FilePickerActivityHelper;
5355
import org.schabi.newpipe.util.FilenameUtils;
5456
import org.schabi.newpipe.util.ListHelper;
@@ -68,8 +70,6 @@
6870
import icepick.State;
6971
import io.reactivex.rxjava3.disposables.CompositeDisposable;
7072
import us.shandian.giga.get.MissionRecoveryInfo;
71-
import us.shandian.giga.io.StoredDirectoryHelper;
72-
import us.shandian.giga.io.StoredFileHelper;
7373
import us.shandian.giga.postprocessing.Postprocessing;
7474
import us.shandian.giga.service.DownloadManager;
7575
import us.shandian.giga.service.DownloadManagerService;

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService
5757
import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_MODE
5858
import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_VALUE
5959
import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.PREVIOUS_EXPORT_MODE
60+
import org.schabi.newpipe.streams.io.StoredFileHelper
6061
import org.schabi.newpipe.util.FilePickerActivityHelper
6162
import org.schabi.newpipe.util.NavigationHelper
6263
import org.schabi.newpipe.util.OnClickGesture
6364
import org.schabi.newpipe.util.ShareUtils
64-
import us.shandian.giga.io.StoredFileHelper
6565
import java.text.SimpleDateFormat
6666
import java.util.Date
6767
import java.util.Locale

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import java.util.List;
3535

3636
import icepick.State;
37-
import us.shandian.giga.io.StoredFileHelper;
37+
import org.schabi.newpipe.streams.io.StoredFileHelper;
3838

3939
import static org.schabi.newpipe.extractor.subscription.SubscriptionExtractor.ContentSource.CHANNEL_URL;
4040
import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.CHANNEL_URL_MODE;

app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.schabi.newpipe.database.subscription.SubscriptionEntity;
3333
import org.schabi.newpipe.extractor.subscription.SubscriptionItem;
3434
import org.schabi.newpipe.streams.io.SharpOutputStream;
35+
import org.schabi.newpipe.streams.io.StoredFileHelper;
3536

3637
import java.io.IOException;
3738
import java.io.OutputStream;
@@ -41,7 +42,6 @@
4142
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
4243
import io.reactivex.rxjava3.functions.Function;
4344
import io.reactivex.rxjava3.schedulers.Schedulers;
44-
import us.shandian.giga.io.StoredFileHelper;
4545

4646
import static org.schabi.newpipe.MainActivity.DEBUG;
4747

app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.schabi.newpipe.extractor.subscription.SubscriptionItem;
3939
import org.schabi.newpipe.ktx.ExceptionUtils;
4040
import org.schabi.newpipe.streams.io.SharpInputStream;
41+
import org.schabi.newpipe.streams.io.StoredFileHelper;
4142
import org.schabi.newpipe.util.Constants;
4243
import org.schabi.newpipe.util.ExtractorHelper;
4344

@@ -52,10 +53,9 @@
5253
import io.reactivex.rxjava3.functions.Consumer;
5354
import io.reactivex.rxjava3.functions.Function;
5455
import io.reactivex.rxjava3.schedulers.Schedulers;
55-
import us.shandian.giga.io.StoredFileHelper;
5656

5757
import static org.schabi.newpipe.MainActivity.DEBUG;
58-
import static us.shandian.giga.io.StoredFileHelper.DEFAULT_MIME;
58+
import static org.schabi.newpipe.streams.io.StoredFileHelper.DEFAULT_MIME;
5959

6060
public class SubscriptionsImportService extends BaseImportExportService {
6161
public static final int CHANNEL_URL_MODE = 0;

app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
import java.util.Date;
3737
import java.util.Locale;
3838

39-
import us.shandian.giga.io.StoredDirectoryHelper;
40-
import us.shandian.giga.io.StoredFileHelper;
39+
import org.schabi.newpipe.streams.io.StoredDirectoryHelper;
40+
import org.schabi.newpipe.streams.io.StoredFileHelper;
4141

4242
import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
4343

app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.net.URLDecoder;
2727
import java.nio.charset.StandardCharsets;
2828

29-
import us.shandian.giga.io.StoredDirectoryHelper;
29+
import org.schabi.newpipe.streams.io.StoredDirectoryHelper;
3030

3131
import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
3232

0 commit comments

Comments
 (0)