Skip to content
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.

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

Resized images #69

Closed
wants to merge 87 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
a1bc147
resized image is loaded instead of full sized image.
tobiasKaminsky May 18, 2015
ce35d64
Merge remote-tracking branch 'upstream/develop' into resizedImages
tobiasKaminsky Jul 1, 2015
788ebbc
reverted library
tobiasKaminsky Jul 1, 2015
61338bb
fixed rotating resized image
tobiasKaminsky Oct 31, 2015
cf22541
fixed storing thumbnails by correct imageKey
tobiasKaminsky Oct 31, 2015
9574845
fix #1230
tobiasKaminsky Oct 31, 2015
3ddb48b
exported must be set to true
tobiasKaminsky Nov 2, 2015
d06a4b1
updated for future use with later PRs
tobiasKaminsky Nov 2, 2015
d5ee0ef
fixed #1244
tobiasKaminsky Nov 5, 2015
ce841a3
Merge remote-tracking branch 'remotes/upstream/master' into resizedIm…
tobiasKaminsky Nov 5, 2015
90382c5
show thumbnail while waiting for resized image
tobiasKaminsky Nov 13, 2015
eac4e49
fixed showing thumbnails in local file list (uploader)
tobiasKaminsky Jan 3, 2016
a6e16a4
wip
tobiasKaminsky Apr 10, 2016
7162aa6
revert exporting FileContentProvider
tobiasKaminsky May 13, 2016
680cf56
correct indentation
tobiasKaminsky May 13, 2016
140e923
update build gradle
tobiasKaminsky May 13, 2016
a9fbec2
revert wip
tobiasKaminsky May 13, 2016
bcb55a0
Merge remote-tracking branch 'remotes/origin/master' into resizedImages
tobiasKaminsky Jun 25, 2016
e3d43e7
wip
tobiasKaminsky Jun 25, 2016
3ff2d58
Merge remote-tracking branch 'remotes/origin/master' into storeResize…
tobiasKaminsky Jul 21, 2016
a550979
resized images are now fetched via gallery app
tobiasKaminsky Jul 23, 2016
67baae4
Merge remote-tracking branch 'remotes/origin/master' into resizedImages2
tobiasKaminsky Jul 23, 2016
8258843
Merge remote-tracking branch 'remotes/origin/resizedImages' into resi…
tobiasKaminsky Jul 23, 2016
cf1e701
minor code enhancements
tobiasKaminsky Jul 23, 2016
93bb169
GPLv3
AndyScherzinger Aug 1, 2016
73da2a1
added second parameter to thumbnail generation task
tobiasKaminsky Aug 1, 2016
9f86064
Merge remote-tracking branch 'origin/resizedImages' into resizedImages
tobiasKaminsky Aug 1, 2016
9a2ae6c
fix bug: resized image was always used indepentent of download state
tobiasKaminsky Sep 3, 2016
69661e6
Merge remote-tracking branch 'remotes/origin/master' into resizedImages
tobiasKaminsky Sep 17, 2016
cbc44a6
Merge remote-tracking branch 'remotes/origin/master' into resizedImages
tobiasKaminsky Sep 18, 2016
b203c48
Merge remote-tracking branch 'remotes/origin/master' into resizedImages
tobiasKaminsky Nov 16, 2016
d1d99c5
send resized image also on filelist
tobiasKaminsky Dec 28, 2016
d6115cb
Merge remote-tracking branch 'remotes/origin/master' into resizedImages
tobiasKaminsky Dec 29, 2016
65be7ef
Merge branch 'master' of https://github.com/nextcloud/android into re…
AndyScherzinger Jan 4, 2017
816f532
Merge branch 'master' of https://github.com/nextcloud/android into re…
AndyScherzinger Jan 10, 2017
e8a92a0
Merge branch 'master' of https://github.com/nextcloud/android into re…
AndyScherzinger Jan 21, 2017
2d76982
Merge remote-tracking branch 'remotes/origin/master' into resizedImages
tobiasKaminsky Feb 13, 2017
18a35a2
fix some codacy issues
tobiasKaminsky Feb 13, 2017
b25fe94
wip snackbars
tobiasKaminsky Mar 4, 2017
f862099
Merge remote-tracking branch 'remotes/origin/master' into resizedImages
tobiasKaminsky Mar 4, 2017
8f29112
wip saving behaviour
tobiasKaminsky Mar 5, 2017
1e653d5
wip snackbar
tobiasKaminsky Mar 18, 2017
46f7e0a
setting / snackbar is working
tobiasKaminsky Mar 19, 2017
e758738
Merge remote-tracking branch 'remotes/origin/master' into resizedImages
tobiasKaminsky Jun 29, 2017
2d2e450
resolved update conflicts, adapted to current system
tobiasKaminsky Jun 30, 2017
416db99
further work: image can now be download via snack
tobiasKaminsky Jul 12, 2017
2ae6824
preference setting: download or preview
tobiasKaminsky Jul 13, 2017
b42ceec
Merge remote-tracking branch 'remotes/origin/master' into resizedImages
tobiasKaminsky Jul 13, 2017
14eed9f
Merge remote-tracking branch 'remotes/origin/master' into resizedImages
tobiasKaminsky Jul 13, 2017
61a71d3
downloading is working if set in preferences
tobiasKaminsky Jul 13, 2017
162473a
Merge remote-tracking branch 'remotes/origin/master' into resizedImages
tobiasKaminsky Jul 13, 2017
3314afb
merge
tobiasKaminsky Jul 13, 2017
ccc3df2
fix downloading/storing of thumbnail
tobiasKaminsky Jul 14, 2017
aba5f8b
split up thumbnail and resized generation part
tobiasKaminsky Jul 20, 2017
4e78a1f
on no resized image possible: show snackbar to download full image
tobiasKaminsky Jul 20, 2017
55fc080
use real class instead of params to transfer infos to ThumbnailGenera…
tobiasKaminsky Jul 20, 2017
a731547
Merge remote-tracking branch 'remotes/origin/master' into resizedImages
tobiasKaminsky Jul 20, 2017
e55ec39
Merge remote-tracking branch 'remotes/origin/master' into resizedImages
tobiasKaminsky Jul 20, 2017
4837d7e
Merge e55ec3904cbd161d5d466cbe0a1029de0107fa84 into 15cff7b33dd72c2dd…
tobiasKaminsky Jul 20, 2017
801b576
Drone: update Lint results to reflect reduced error/warning count [sk…
Jul 20, 2017
a28ffbc
send resized image
tobiasKaminsky Aug 2, 2017
1c924da
show error message if no network else "no resized image possible"
tobiasKaminsky Aug 2, 2017
da0ca61
fallback to thumbnail for sharing if no resized image is available
tobiasKaminsky Aug 2, 2017
394bd00
on delete: store resized image out of download one.
tobiasKaminsky Aug 4, 2017
5923606
Merge remote-tracking branch 'remotes/origin/master' into resizedImages
tobiasKaminsky Aug 4, 2017
bb87d5c
fall back to default image if thumbnail is not available
tobiasKaminsky Aug 4, 2017
065cc5b
Merge bb87d5cd46d0fc8772b7f206b1430b41d2d7ce58 into 75d6de9b7c0db16db…
tobiasKaminsky Aug 4, 2017
592117c
Drone: update Lint results to reflect reduced error/warning count [sk…
Aug 4, 2017
9c9f877
Merge branch 'master' of https://github.com/nextcloud/android into re…
AndyScherzinger Aug 8, 2017
65c4b33
Merge branch 'master' of https://github.com/nextcloud/android into re…
AndyScherzinger Aug 10, 2017
e2f407b
Merge 65c4b33f84c102daf9b0dd14aa30d4f1922497f3 into 46ff9288e18fc5939…
tobiasKaminsky Aug 10, 2017
b4dfb76
Drone: update Lint results to reflect reduced error/warning count [sk…
Aug 10, 2017
b86f103
proper exception handling
tobiasKaminsky Aug 11, 2017
3fd9f2c
Merge branch 'master' into resizedImages
tobiasKaminsky Aug 11, 2017
fa50afc
Merge 3fd9f2c8e73a260f0f8183f5c75850e0103feefc into ece3acb0c4b6153ac…
tobiasKaminsky Aug 11, 2017
64c2184
Drone: update Lint results to reflect reduced error/warning count [sk…
Aug 11, 2017
69d3df5
Merge branch 'master' of https://github.com/nextcloud/android into re…
AndyScherzinger Aug 11, 2017
68ecd20
Merge 69d3df50ee7521b1089baf114c962b2ea24c2f8a into 519702c7c47747852…
tobiasKaminsky Aug 11, 2017
681d1dc
Drone: update Lint results to reflect reduced error/warning count [sk…
Aug 11, 2017
be8488a
Merge branch 'master' of https://github.com/nextcloud/android into re…
AndyScherzinger Aug 14, 2017
2e68ca4
Merge branch 'master' of https://github.com/nextcloud/android into re…
AndyScherzinger Aug 18, 2017
1ad1750
Merge 2e68ca48e7e038c9db7927e1b6974352a6b80011 into fe093cc7d03d18998…
tobiasKaminsky Aug 18, 2017
4cba6ba
Drone: update Lint results to reflect reduced error/warning count [sk…
Aug 18, 2017
ed55434
Merge branch 'master' of https://github.com/nextcloud/android into re…
AndyScherzinger Aug 21, 2017
d58a52e
Merge ed55434e0894f401db680d27b403355c410405ce into 9a9f40f1fbc3d4fc4…
tobiasKaminsky Aug 21, 2017
4868fed
Drone: update Lint results to reflect reduced error/warning count [sk…
Aug 21, 2017
dcdd708
fix string (rogue characters)
AndyScherzinger Sep 25, 2017
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
2 changes: 1 addition & 1 deletion scripts/lint/lint-results.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE
<span class="mdl-layout-title">Lint Report: 1 error and 520 warnings</span>
<span class="mdl-layout-title">Lint Report: 1 error and 515 warnings</span>
13 changes: 10 additions & 3 deletions src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,9 @@
<activity android:name=".ui.activity.UserInfoActivity" />
<activity android:name=".ui.activity.NotificationsActivity"/>
<activity android:name=".ui.activity.ParticipateActivity" />
<activity android:name=".ui.activity.ActivitiesListActivity"
android:configChanges="orientation|screenSize|keyboardHidden" />
<activity
android:name=".ui.activity.ActivitiesListActivity"
android:configChanges="orientation|screenSize|keyboardHidden"/>
<activity android:name=".ui.activity.SyncedFoldersActivity"/>
<activity android:name=".ui.activity.UploadFilesActivity" />
<activity android:name=".ui.activity.ExternalSiteWebView"
Expand Down Expand Up @@ -187,6 +188,12 @@
android:resource="@xml/exposed_filepaths" />
</provider>

<provider
android:name=".providers.DiskLruImageCacheFileProvider"
android:authorities="org.nextcloud.imageCache.provider"
android:exported="true">
</provider>

<activity
android:name=".authentication.AuthenticatorActivity"
android:exported="true"
Expand Down Expand Up @@ -224,7 +231,7 @@
<activity android:name=".ui.activity.ConflictsResolveActivity"/>
<activity android:name=".ui.activity.GenericExplanationActivity"/>
<activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity"/>

<activity android:name=".ui.activity.LogHistoryActivity"/>

<activity android:name=".ui.errorhandling.ErrorShowActivity" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public static Account getCurrentOwnCloudAccount(Context context) {

if (defaultAccount == null && ocAccounts.length > 0) {
// take first which is not pending for removal account as fallback
for (Account account: ocAccounts) {
for (Account account : ocAccounts) {
boolean pendingForRemoval = arbitraryDataProvider.getBooleanValue(account,
ManageAccountsActivity.PENDING_FOR_REMOVAL);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ private void initWebViewLogin(String baseURL) {
mLoginWebView.getSettings().setSaveFormData(false);
mLoginWebView.getSettings().setSavePassword(false);

if (baseURL != null && !baseURL.isEmpty()){
if (baseURL != null && !baseURL.isEmpty()) {
Map<String, String> headers = new HashMap<>();
headers.put(RemoteOperation.OCS_API_HEADER, RemoteOperation.OCS_API_HEADER_VALUE);
mLoginWebView.loadUrl(baseURL + WEB_LOGIN, headers);
Expand Down
Loading