mirror of
https://codeberg.org/tom79/Fedilab.git
synced 2024-12-22 16:50:04 +02:00
Fix Peertube instances search
This commit is contained in:
parent
fec7039fbe
commit
dd119449f3
4 changed files with 6 additions and 11 deletions
|
@ -227,7 +227,6 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
|
|||
}
|
||||
return true;
|
||||
});
|
||||
startInForeground();
|
||||
} else {
|
||||
binding.navView.setOnItemSelectedListener(item -> {
|
||||
int itemId = item.getItemId();
|
||||
|
@ -247,7 +246,7 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
|
|||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
startInForeground();
|
||||
if (getSupportActionBar() != null) {
|
||||
getSupportActionBar().setDisplayShowTitleEnabled(false);
|
||||
}
|
||||
|
@ -513,13 +512,8 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
|
|||
private void startInForeground() {
|
||||
Intent notificationIntent = new Intent(this, RetrieveInfoService.class);
|
||||
try {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||
startForegroundService(notificationIntent);
|
||||
} else {
|
||||
startService(notificationIntent);
|
||||
}
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
} catch (Exception ignored) {}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -18,6 +18,7 @@ import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_ID;
|
|||
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_INSTANCE;
|
||||
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_SOFTWARE;
|
||||
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_TOKEN;
|
||||
import static app.fedilab.android.peertube.helper.Helper.peertubeInformation;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
|
@ -27,6 +28,7 @@ import android.database.sqlite.SQLiteDatabase;
|
|||
import android.net.Uri;
|
||||
import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
import android.util.Log;
|
||||
import android.webkit.MimeTypeMap;
|
||||
import android.webkit.URLUtil;
|
||||
|
||||
|
@ -866,6 +868,7 @@ public class RetrofitPeertubeAPI {
|
|||
String value = (String) obj.get(key);
|
||||
data.put(Integer.valueOf(key), value);
|
||||
} catch (JSONException ignored) {
|
||||
ignored.printStackTrace();
|
||||
}
|
||||
}
|
||||
peertubeInformation.setCategories(data);
|
||||
|
|
|
@ -87,7 +87,6 @@ public class FragmentLoginPickInstancePeertube extends Fragment implements Insta
|
|||
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
|
||||
binding = FragmentLoginPickInstancePeertubeBinding.inflate(inflater, container, false);
|
||||
|
||||
|
||||
if (peertubeInformation == null || peertubeInformation.getLanguages() == null) {
|
||||
new Thread(() -> {
|
||||
peertubeInformation = new PeertubeInformation();
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginTop="@dimen/fab_margin"
|
||||
android:background="?android:windowBackground">
|
||||
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
|
|
Loading…
Reference in a new issue