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

Merge branch 'working' into 'develop' 

some changes

See merge request tom79/fedilab!530
This commit is contained in:
Thomas 2019-08-10 17:04:40 +02:00
parent 0ff62abed9 3c51d0ac35
commit 95e52470f5
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3081,8 +3081,7 @@ public class API {
if( notificationId == null)
action = "/notifications/clear";
else {
params.put("id",notificationId);
action = "/notifications/dismiss";
action = "/notifications/" + notificationId + "/dismiss";
}
try {
new HttpsConnection(context, this.instance).post(getAbsoluteUrl(action), 10, params, prefKeyOauthTokenT);

2
app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java
View File

@ -311,6 +311,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
editor.apply();
}
});
final LinearLayout set_auto_backup_text = rootView.findViewById(R.id.set_auto_backup_text);
set_auto_backup_text.setOnClickListener(view -> set_auto_backup.performClick());
TagsEditText set_featured_tags = rootView.findViewById(R.id.set_featured_tags);

1
app/src/main/res/layout/fragment_settings_reveal.xml
View File

@ -964,6 +964,7 @@
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_auto_backup_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"