Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

media in notifications

This commit is contained in:
tom79 2019-12-17 18:04:59 +01:00
parent 2513a2f305
commit 1668e2da5d
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/assets/changelogs/344.txt
View File

@ -4,4 +4,5 @@ Added
Fixed
- Counter for mentions
- Preview images displayed twice
- Preview images displayed twice
- Media not saved on Android 10+

3
app/src/main/java/app/fedilab/android/activities/LoginActivity.java
View File

@ -351,6 +351,9 @@ public class LoginActivity extends BaseActivity {
public void run() {
try {
final String response = new HttpsConnection(LoginActivity.this, instance).get("https://instances.social/api/1.0" + action, 30, parameters, Helper.THEKINRAR_SECRET_TOKEN);
if( response == null) {
return;
}
runOnUiThread(new Runnable() {
public void run() {
String[] instances;

15
app/src/main/java/app/fedilab/android/client/API.java
View File

@ -3258,17 +3258,14 @@ public class API {
try {
HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
String response = httpsConnection.get("https://" + instance + "/api/v1/videos", 10, params, null);
JSONArray jsonArray = new JSONObject(response).getJSONArray("data");
peertubes = parsePeertube(instance, jsonArray);
JSONObject jsonObject = new JSONObject(response);
if( jsonObject.has("data")) {
JSONArray jsonArray = new JSONObject(response).getJSONArray("data");
peertubes = parsePeertube(instance, jsonArray);
}
} catch (HttpsConnection.HttpsConnectionException e) {
setError(e.getStatusCode(), e);
} catch (NoSuchAlgorithmException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
} catch (KeyManagementException e) {
e.printStackTrace();
} catch (JSONException e) {
} catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
e.printStackTrace();
}
apiResponse.setPeertubes(peertubes);

2
app/src/main/res/layout/activity_main.xml
View File

@ -161,7 +161,7 @@
android:layout_gravity="start"
android:fitsSystemWindows="false"
app:itemTextColor="?attr/textColor"
android:background="@color/cyanea_primary_dark_reference"
app:headerLayout="@layout/nav_header_main"
app:menu="@menu/activity_main_drawer" />

4
app/src/main/res/values/styles.xml
View File

@ -132,7 +132,6 @@
<style name="TransparentLight" parent="Theme.Cyanea.Light">black_icon_theme
<item name="iconColor">@color/black</item>
<item name="iconColorMenu">@color/black</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
<item name="textColor">@color/black</item>
@ -144,7 +143,6 @@
<style name="TransparentDark" parent="Theme.Cyanea.Dark">
<item name="iconColor">@color/dark_icon_theme</item>
<item name="iconColorMenu">@color/dark_icon_theme</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:textColor">@color/dark_text</item>
@ -155,7 +153,7 @@
<style name="TransparentBlack" parent="Theme.Cyanea.Dark">
<item name="iconColor">@color/black_icon_theme</item>
<item name="iconColorMenu">@color/dark_icon_theme</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:textColor">@color/dark_text</item>