mirror of
https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git
synced 2025-02-11 17:08:43 +01:00
Compare commits
7 Commits
c0738947b7
...
dce5a8d89c
Author | SHA1 | Date | |
---|---|---|---|
|
dce5a8d89c | ||
|
a82f2b68e3 | ||
|
a36ddccefd | ||
|
bbe696a37b | ||
|
13ec5f84c4 | ||
|
587ebbb309 | ||
|
485611970f |
@ -1,3 +1,9 @@
|
|||||||
|
clone:
|
||||||
|
git:
|
||||||
|
image: woodpeckerci/plugin-git
|
||||||
|
settings:
|
||||||
|
partial: false
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
build:
|
build:
|
||||||
image: alvrme/alpine-android:android-33-jdk11
|
image: alvrme/alpine-android:android-33-jdk11
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
package eu.toldi.infinityforlemmy;
|
package eu.toldi.infinityforlemmy;
|
||||||
|
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
import android.text.Html;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
|
|
||||||
@ -9,9 +8,6 @@ import org.json.JSONException;
|
|||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
|
|
||||||
import eu.toldi.infinityforlemmy.apis.LemmyAPI;
|
import eu.toldi.infinityforlemmy.apis.LemmyAPI;
|
||||||
import eu.toldi.infinityforlemmy.apis.RedditAPI;
|
|
||||||
import eu.toldi.infinityforlemmy.utils.APIUtils;
|
|
||||||
import eu.toldi.infinityforlemmy.utils.JSONUtils;
|
|
||||||
import eu.toldi.infinityforlemmy.utils.LemmyUtils;
|
import eu.toldi.infinityforlemmy.utils.LemmyUtils;
|
||||||
import retrofit2.Call;
|
import retrofit2.Call;
|
||||||
import retrofit2.Callback;
|
import retrofit2.Callback;
|
||||||
@ -83,7 +79,7 @@ public class FetchMyInfo {
|
|||||||
if (!person.isNull("banner")) {
|
if (!person.isNull("banner")) {
|
||||||
bannerImageUrl = person.getString("banner");
|
bannerImageUrl = person.getString("banner");
|
||||||
}
|
}
|
||||||
display_name = person.getString("name");
|
display_name = (person.has("display_name")) ? person.getString("display_name") : person.getString("name");
|
||||||
redditDataRoomDatabase.accountDao().updateAccountInfo(name, profileImageUrl, bannerImageUrl);
|
redditDataRoomDatabase.accountDao().updateAccountInfo(name, profileImageUrl, bannerImageUrl);
|
||||||
} catch (JSONException e) {
|
} catch (JSONException e) {
|
||||||
parseFailed = true;
|
parseFailed = true;
|
||||||
|
@ -91,8 +91,10 @@ public class LinkResolverActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
((Infinity) getApplication()).getAppComponent().inject(this);
|
((Infinity) getApplication()).getAppComponent().inject(this);
|
||||||
mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
|
mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
|
||||||
String instance = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_INSTANCE, null);
|
if (mAccessToken != null) {
|
||||||
mRetrofit.setBaseURL(instance);
|
String instance = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_INSTANCE, null);
|
||||||
|
mRetrofit.setBaseURL(instance);
|
||||||
|
}
|
||||||
|
|
||||||
Uri uri = getIntent().getData();
|
Uri uri = getIntent().getData();
|
||||||
if (uri == null) {
|
if (uri == null) {
|
||||||
|
@ -5,7 +5,7 @@ public class LemmyUtils {
|
|||||||
String[] splitURL = url.split("/");
|
String[] splitURL = url.split("/");
|
||||||
String userName = splitURL[splitURL.length - 1];
|
String userName = splitURL[splitURL.length - 1];
|
||||||
String domain = splitURL[2];
|
String domain = splitURL[2];
|
||||||
return userName + "@" + domain;
|
return (userName.contains("@")) ? userName : userName + "@" + domain;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String qualifiedCommunityName2ActorId(String qualifiedName) {
|
public static String qualifiedCommunityName2ActorId(String qualifiedName) {
|
||||||
|
3
app/src/nightly/res/values/strings.xml
Normal file
3
app/src/nightly/res/values/strings.xml
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
<resources>
|
||||||
|
<string name="application_name" translatable="false">Infinity for Lemmy (Nightly)</string>
|
||||||
|
</resources>
|
Loading…
x
Reference in New Issue
Block a user