Skip to content

Add activity previews #73

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

Merged
tobiasKaminsky merged 4 commits into from
Dec 14, 2018
Merged

Add activity previews #73

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e465852
Add activity previews
nickvergessen Aug 15, 2017
f97ed96
simplify loop
tobiasKaminsky Oct 29, 2018
717d7ab
wip
tobiasKaminsky Oct 30, 2018
8e77d36
changes due to rebase
tobiasKaminsky Dec 10, 2018
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
Prev Previous commit
Next Next commit
simplify loop 
Signed-off-by: tobiasKaminsky <[email protected]>
  • Loading branch information
@tobiasKaminsky
tobiasKaminsky committed Dec 10, 2018
commit f97ed9654ff7b432d897545b64753fc14a6ee4d7
19 changes: 8 additions & 11 deletions src/com/owncloud/android/lib/resources/activities/models/PreviewListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

import com.google.gson.TypeAdapter;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter;

import java.io.IOException;
Expand All @@ -40,7 +39,7 @@ public class PreviewListAdapter extends TypeAdapter<PreviewObject> {

@Override
public void write(JsonWriter out, PreviewObject value) {

// not needed
}

@Override
Expand All @@ -49,26 +48,24 @@ public PreviewObject read(JsonReader in) throws IOException {
in.beginObject();

while (in.hasNext()) {
String name = in.nextName();
if (name != null && !name.isEmpty()) {
preview = readObject(name, in);
String name = in.peek().toString();
if (!name.isEmpty()) {
preview = readObject(in);
}
}


in.endObject();

return preview;
}

private PreviewObject readObject(String tag, JsonReader in) throws IOException {
private PreviewObject readObject(JsonReader in) throws IOException {
String tag;
PreviewObject preview = new PreviewObject();

do {
if (in.peek() == JsonToken.NAME) {
tag = in.nextName();
}

tag = in.nextName();

switch (tag) {
case "source":
preview.setSource(in.nextString());
Expand Down
3 changes: 0 additions & 3 deletions src/com/owncloud/android/lib/resources/activities/models/PreviewObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ public class PreviewObject {
private String mimeType;
private String view;

public PreviewObject() {
}

public String getLink() {
return link;
}
Expand Down