Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d10e1dc authored by Stefan Niedermann's avatar Stefan Niedermann Committed by Niedermann IT-Dienstleistungen
Browse files

Reduce diff with master 



Signed-off-by: default avatarStefan Niedermann <info@niedermann.it>
parent eb67e280

lib/src/main/java/com/nextcloud/android/sso/Constants.java

+0 −6
Original line number Diff line number Diff line
@@ -46,18 +46,12 @@ public class Constants { 
    public static final String PACKAGE_NAME_PROD = FilesAppType.PROD.packageId;

    /** @deprecated Use {@link FilesAppType#packageId} */

    @Deprecated

    public static final String PACKAGE_NAME_QA = FilesAppType.QA.packageId;

    /** @deprecated Use {@link FilesAppType#packageId} */

    @Deprecated

    public static final String PACKAGE_NAME_DEV = FilesAppType.DEV.packageId;

    /** @deprecated Use {@link FilesAppType#accountType} */

    @Deprecated

    public static final String ACCOUNT_TYPE_PROD = FilesAppType.PROD.accountType;

    /** @deprecated Use {@link FilesAppType#accountType} */

    @Deprecated

    public static final String ACCOUNT_TYPE_QA = FilesAppType.QA.accountType;

    /** @deprecated Use {@link FilesAppType#accountType} */

    @Deprecated

    public static final String ACCOUNT_TYPE_DEV = FilesAppType.DEV.accountType;



}

lib/src/main/java/com/nextcloud/android/sso/api/AidlNetworkRequest.java

+5 −5
Original line number Diff line number Diff line
@@ -182,12 +182,12 @@ public class AidlNetworkRequest extends NetworkRequest { 
    /**

     * The InputStreams needs to be closed after reading from it

     *

     * @deprecated Use {@link #performNetworkRequestV2(NextcloudRequest, InputStream)}

     * @see <a href="https://github.com/nextcloud/Android-SingleSignOn/issues/133">Issue #133</a>

     * @param request                {@link NextcloudRequest} request to be executed on server via Files app

     * @param requestBodyInputStream inputstream to be sent to the server

     * @return InputStream answer from server as InputStream

     * @throws Exception or SSOException

     * @see <a href="https://github.com/nextcloud/Android-SingleSignOn/issues/133">Issue #133</a>

     * @deprecated Use {@link #performNetworkRequestV2(NextcloudRequest, InputStream)}

     */

    @Deprecated

    public InputStream performNetworkRequest(NextcloudRequest request, InputStream requestBodyInputStream) throws Exception {
@@ -218,11 +218,11 @@ public class AidlNetworkRequest extends NetworkRequest { 
    /**

     * <strong>DO NOT CALL THIS METHOD DIRECTLY</strong> - use {@link #performNetworkRequest} instead

     *

     * @deprecated Use {@link #performAidlNetworkRequestV2(NextcloudRequest, InputStream)}

     * @see <a href="https://github.com/nextcloud/Android-SingleSignOn/issues/133">Issue #133</a>

     * @param request

     * @return

     * @throws IOException

     * @see <a href="https://github.com/nextcloud/Android-SingleSignOn/issues/133">Issue #133</a>

     * @deprecated Use {@link #performAidlNetworkRequestV2(NextcloudRequest, InputStream)}

     */

    @Deprecated

    private ParcelFileDescriptor performAidlNetworkRequest(@NonNull NextcloudRequest request,