Compare commits

...

7 Commits

Author SHA1 Message Date
Balazs Toldi
dce5a8d89c
Fix resolving communities from non-home instance URLs 2023-08-15 08:23:14 +02:00
Balazs Toldi
a82f2b68e3
Merge branch 'feature/bugfixes' 2023-08-15 08:11:01 +02:00
Balazs Toldi
a36ddccefd
Fix parsing user display name 2023-08-15 08:10:21 +02:00
Balazs Toldi
bbe696a37b
Fix anonymous link resolving 2023-08-15 07:55:07 +02:00
Bazsalanszky
13ec5f84c4 Merge pull request 'Nightly build fixes' (#116) from feature/nightly into master
Reviewed-on: https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy/pulls/116
2023-08-15 05:33:17 +00:00
Balazs Toldi
587ebbb309
Change nightly build app name 2023-08-15 07:15:43 +02:00
Balazs Toldi
485611970f
Potential fix for nightly build version codes 2023-08-15 07:15:19 +02:00
5 changed files with 15 additions and 8 deletions

View File

@ -1,3 +1,9 @@
clone:
git:
image: woodpeckerci/plugin-git
settings:
partial: false
steps:
build:
image: alvrme/alpine-android:android-33-jdk11

View File

@ -1,7 +1,6 @@
package eu.toldi.infinityforlemmy;
import android.os.AsyncTask;
import android.text.Html;
import androidx.annotation.NonNull;
@ -9,9 +8,6 @@ import org.json.JSONException;
import org.json.JSONObject;
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 retrofit2.Call;
import retrofit2.Callback;
@ -83,7 +79,7 @@ public class FetchMyInfo {
if (!person.isNull("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);
} catch (JSONException e) {
parseFailed = true;

View File

@ -91,8 +91,10 @@ public class LinkResolverActivity extends AppCompatActivity {
((Infinity) getApplication()).getAppComponent().inject(this);
mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
String instance = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_INSTANCE, null);
mRetrofit.setBaseURL(instance);
if (mAccessToken != null) {
String instance = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_INSTANCE, null);
mRetrofit.setBaseURL(instance);
}
Uri uri = getIntent().getData();
if (uri == null) {

View File

@ -5,7 +5,7 @@ public class LemmyUtils {
String[] splitURL = url.split("/");
String userName = splitURL[splitURL.length - 1];
String domain = splitURL[2];
return userName + "@" + domain;
return (userName.contains("@")) ? userName : userName + "@" + domain;
}
public static String qualifiedCommunityName2ActorId(String qualifiedName) {

View File

@ -0,0 +1,3 @@
<resources>
<string name="application_name" translatable="false">Infinity for Lemmy (Nightly)</string>
</resources>