Skip to content

Replace the deprecated org.apache.http package #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BlinkoWang wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Replace the deprecated org.apache.http package #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f32a0ce
Replace the deprecated org.apache.http package
Jan 8, 2016
6c746ec
add https support
Jan 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/build/intermediates/incremental/mergeAssets/androidTest/debug/merger.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="/Users/leridge/DownloadProvider/app/src/androidTest/assets"/></dataSet></merger>
<merger version="3">
<dataSet config="main">
<source
path="/Users/blinko/Documents/workspace/DownloadProvider/app/src/androidTest/assets" />
</dataSet>
</merger>
2 changes: 1 addition & 1 deletion app/build/intermediates/incremental/mergeAssets/debug/merger.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="/Users/leridge/DownloadProvider/app/src/main/assets"/></dataSet><dataSet config="debug"><source path="/Users/leridge/DownloadProvider/app/src/debug/assets"/></dataSet></merger>
<merger version="3"><dataSet config="main"><source path="/Users/blinko/Documents/workspace/DownloadProvider/app/src/main/assets"/></dataSet><dataSet config="debug"><source path="/Users/blinko/Documents/workspace/DownloadProvider/app/src/debug/assets"/></dataSet></merger>
11 changes: 10 additions & 1 deletion app/build/intermediates/incremental/mergeResourcesandroidTest/debug/merger.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main"><source path="/Users/leridge/DownloadProvider/app/src/androidTest/res"/><source path="/Users/leridge/DownloadProvider/app/build/generated/res/rs/androidTest/debug"/><source path="/Users/leridge/DownloadProvider/app/build/generated/res/resValues/androidTest/debug"/></dataSet><mergedItems/></merger>
<merger version="3">
<dataSet config="main">
<source path="/Users/blinko/Documents/workspace/DownloadProvider/app/src/androidTest/res" />
<source
path="/Users/blinko/Documents/workspace/DownloadProvider/app/build/generated/res/rs/androidTest/debug" />
<source
path="/Users/blinko/Documents/workspace/DownloadProvider/app/build/generated/res/resValues/androidTest/debug" />
</dataSet>
<mergedItems />
</merger>
42 changes: 21 additions & 21 deletions app/build/intermediates/incremental/mergeResourcesdebug/merger.xml
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions app/build/intermediates/manifests/full/debug/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="com.mozillaonline.providers.downloads.ui.DownloadList" >
</activity>
<activity android:name="com.mozillaonline.providers.downloads.ui.DownloadList" />

<provider
android:name="com.mozillaonline.providers.downloads.DownloadProvider"
Expand Down
13 changes: 6 additions & 7 deletions app/build/intermediates/res/merged/debug/anim/footer_appear.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
** Copyright 2010, Google Inc.
**
** Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -16,11 +15,11 @@
*/
-->

<set xmlns:android="http://schemas.android.com/apk/res/android" >
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate
android:interpolator="@android:anim/decelerate_interpolator"
android:duration="300"
android:fromYDelta="+12%p"
android:toYDelta="0"
android:duration="300" />
android:interpolator="@android:anim/decelerate_interpolator"
android:toYDelta="0" />
</set>
<!-- From: file:/Users/leridge/DownloadProvider/app/src/main/res/anim/footer_appear.xml -->
<!-- From: file:/Users/blinko/Documents/workspace/DownloadProvider/app/src/main/res/anim/footer_appear.xml -->
13 changes: 6 additions & 7 deletions app/build/intermediates/res/merged/debug/anim/footer_disappear.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
** Copyright 2010, Google Inc.
**
** Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -16,11 +15,11 @@
*/
-->

<set xmlns:android="http://schemas.android.com/apk/res/android" >
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate
android:interpolator="@android:anim/decelerate_interpolator"
android:duration="300"
android:fromYDelta="0"
android:toYDelta="+12%p"
android:duration="300" />
android:interpolator="@android:anim/decelerate_interpolator"
android:toYDelta="+12%p" />
</set>
<!-- From: file:/Users/leridge/DownloadProvider/app/src/main/res/anim/footer_disappear.xml -->
<!-- From: file:/Users/blinko/Documents/workspace/DownloadProvider/app/src/main/res/anim/footer_disappear.xml -->
96 changes: 53 additions & 43 deletions app/build/intermediates/res/merged/debug/layout/download_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
/*
** Copyright 2010, The Android Open Source Project
**
Expand All @@ -17,51 +16,62 @@
*/
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<!-- The main area showing the list of downloads -->
<FrameLayout android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1">
<ExpandableListView android:id="@+id/date_ordered_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
<ListView android:id="@+id/size_ordered_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1">

<ExpandableListView
android:id="@+id/date_ordered_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />

<ListView
android:id="@+id/size_ordered_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />

<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/empty"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:text="@string/no_downloads"
android:gravity="center"
android:textStyle="bold"/>
android:id="@+id/empty"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center"
android:text="@string/no_downloads"
android:textStyle="bold" />
</FrameLayout>

<!-- The selection menu that pops up from the bottom of the screen -->
<LinearLayout android:id="@+id/selection_menu"
android:orientation="horizontal"
android:visibility="gone"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="5dip"
android:paddingLeft="4dip"
android:paddingRight="4dip"
android:paddingBottom="1dip"
android:gravity="center"
android:layout_gravity="center"
android:background="@android:drawable/bottom_bar">
<Button android:id="@+id/selection_delete"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"/>
<Button android:id="@+id/deselect_all"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
android:text="@string/deselect_all"/>
<LinearLayout
android:id="@+id/selection_menu"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@android:drawable/bottom_bar"
android:gravity="center"
android:orientation="horizontal"
android:paddingBottom="1dip"
android:paddingLeft="4dip"
android:paddingRight="4dip"
android:paddingTop="5dip"
android:visibility="gone">

<Button
android:id="@+id/selection_delete"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1" />

<Button
android:id="@+id/deselect_all"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
android:text="@string/deselect_all" />

</LinearLayout>
</LinearLayout>
</LinearLayout>
<!-- From: file:/Users/leridge/DownloadProvider/app/src/main/res/layout/download_list.xml -->
<!-- From: file:/Users/blinko/Documents/workspace/DownloadProvider/app/src/main/res/layout/download_list.xml -->
7 changes: 3 additions & 4 deletions app/build/intermediates/res/merged/debug/layout/download_list_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
/*
** Copyright 2010, The Android Open Source Project
**
Expand All @@ -22,7 +21,7 @@
android:layout_height="wrap_content"
android:descendantFocusability="blocksDescendants"
android:gravity="center_vertical"
android:paddingRight="?android:attr/scrollbarSize" >
android:paddingRight="?android:attr/scrollbarSize">

<!-- Clicks are handled directly by DownloadItem -->

Expand Down Expand Up @@ -93,4 +92,4 @@
android:paddingLeft="15dp"
android:textAppearance="?android:attr/textAppearanceSmall" />

</com.mozillaonline.providers.downloads.ui.DownloadItem><!-- From: file:/Users/leridge/DownloadProvider/app/src/main/res/layout/download_list_item.xml -->
</com.mozillaonline.providers.downloads.ui.DownloadItem><!-- From: file:/Users/blinko/Documents/workspace/DownloadProvider/app/src/main/res/layout/download_list_item.xml -->
19 changes: 9 additions & 10 deletions app/build/intermediates/res/merged/debug/layout/list_group_header.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2010 The Android Open Source Project
<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 The Android Open Source Project

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -15,11 +14,11 @@
-->

<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:textAppearance="?android:attr/textAppearanceMedium"
android:paddingLeft="43dip"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"/>
<!-- From: file:/Users/leridge/DownloadProvider/app/src/main/res/layout/list_group_header.xml -->
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingLeft="43dip"
android:textAppearance="?android:attr/textAppearanceMedium" />
<!-- From: file:/Users/blinko/Documents/workspace/DownloadProvider/app/src/main/res/layout/list_group_header.xml -->
13 changes: 5 additions & 8 deletions app/build/intermediates/res/merged/debug/layout/main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,24 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >
android:orientation="vertical">

<EditText
android:id="@+id/url_input_edittext"
android:layout_width="fill_parent"
android:layout_height="wrap_content" >
</EditText>
android:layout_height="wrap_content"></EditText>

<Button
android:id="@+id/start_download_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Start" >
</Button>
android:text="Start"></Button>

<Button
android:id="@+id/show_download_list_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Show download list"
android:visibility="visible" >
</Button>
android:visibility="visible"></Button>

</LinearLayout><!-- From: file:/Users/leridge/DownloadProvider/app/src/main/res/layout/main.xml -->
</LinearLayout><!-- From: file:/Users/blinko/Documents/workspace/DownloadProvider/app/src/main/res/layout/main.xml -->
15 changes: 7 additions & 8 deletions app/build/intermediates/res/merged/debug/layout/status_bar_ongoing_event_progress_bar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
/*
** Copyright 2008, The Android Open Source Project
**
Expand All @@ -21,20 +20,20 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@android:drawable/status_bar_item_app_background"
android:orientation="vertical" >
android:orientation="vertical">

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal" >
android:orientation="horizontal">

<LinearLayout
android:layout_width="40dp"
android:layout_height="fill_parent"
android:clickable="true"
android:focusable="true"
android:orientation="vertical"
android:paddingTop="8dp" >
android:paddingTop="8dp">

<ImageView
android:id="@+id/appIcon"
Expand All @@ -56,7 +55,7 @@
android:layout_height="fill_parent"
android:clickable="true"
android:focusable="true"
android:orientation="vertical" >
android:orientation="vertical">

<LinearLayout
android:layout_width="fill_parent"
Expand All @@ -65,7 +64,7 @@
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
android:paddingTop="10dp" >
android:paddingTop="10dp">

<TextView
android:id="@+id/title"
Expand Down Expand Up @@ -108,4 +107,4 @@
android:layout_height="wrap_content"
android:src="@android:drawable/divider_horizontal_bright" />

</LinearLayout><!-- From: file:/Users/leridge/DownloadProvider/app/src/main/res/layout/status_bar_ongoing_event_progress_bar.xml -->
</LinearLayout><!-- From: file:/Users/blinko/Documents/workspace/DownloadProvider/app/src/main/res/layout/status_bar_ongoing_event_progress_bar.xml -->
19 changes: 10 additions & 9 deletions app/build/intermediates/res/merged/debug/menu/download_ui_menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 The Android Open Source Project
<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 The Android Open Source Project

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -15,11 +14,13 @@
-->

<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/download_menu_sort_by_size"
android:title="@string/download_menu_sort_by_size"
android:icon="@android:drawable/ic_menu_sort_by_size" />
<item android:id="@+id/download_menu_sort_by_date"
android:title="@string/download_menu_sort_by_date"
android:icon="@drawable/ic_menu_desk_clock" />
<item
android:id="@+id/download_menu_sort_by_size"
android:icon="@android:drawable/ic_menu_sort_by_size"
android:title="@string/download_menu_sort_by_size" />
<item
android:id="@+id/download_menu_sort_by_date"
android:icon="@drawable/ic_menu_desk_clock"
android:title="@string/download_menu_sort_by_date" />
</menu>
<!-- From: file:/Users/leridge/DownloadProvider/app/src/main/res/menu/download_ui_menu.xml -->
<!-- From: file:/Users/blinko/Documents/workspace/DownloadProvider/app/src/main/res/menu/download_ui_menu.xml -->
Loading