Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix AppCenter SDK

This commit is contained in:
Grishka 2022-02-19 03:04:04 +03:00
parent c382668049
commit f4e71cf130
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mastodon/build.gradle
View File

@ -10,7 +10,7 @@ android {
applicationId "org.joinmastodon.android" applicationId "org.joinmastodon.android"
minSdk 23 minSdk 23
targetSdk 31 targetSdk 31
versionCode 2 versionCode 3
versionName "0.1" versionName "0.1"
} }
@ -23,7 +23,8 @@ android {
debuggable true debuggable true
} }
appcenterPrivateBeta{ appcenterPrivateBeta{
initWith debug initWith release
minifyEnabled false
versionNameSuffix "-priv-beta" versionNameSuffix "-priv-beta"
} }
appcenterPublicBeta{ appcenterPublicBeta{

2
mastodon/src/appcenter/java/org/joinmastodon/android/AppCenterWrapper.java
View File

@ -12,6 +12,8 @@ public class AppCenterWrapper{
private static final String TAG="AppCenterWrapper"; private static final String TAG="AppCenterWrapper";
public static void init(Application app){ public static void init(Application app){
if(AppCenter.isConfigured())
return;
Log.i(TAG, "initializing AppCenter SDK, build type is "+BuildConfig.BUILD_TYPE); Log.i(TAG, "initializing AppCenter SDK, build type is "+BuildConfig.BUILD_TYPE);
if(BuildConfig.BUILD_TYPE.equals("appcenterPrivateBeta")) if(BuildConfig.BUILD_TYPE.equals("appcenterPrivateBeta"))

10
mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
View File

@ -1,11 +1,14 @@
package org.joinmastodon.android; package org.joinmastodon.android;
import android.app.Application;
import android.os.Bundle; import android.os.Bundle;
import org.joinmastodon.android.api.session.AccountSessionManager; import org.joinmastodon.android.api.session.AccountSessionManager;
import org.joinmastodon.android.fragments.HomeFragment; import org.joinmastodon.android.fragments.HomeFragment;
import org.joinmastodon.android.fragments.SplashFragment; import org.joinmastodon.android.fragments.SplashFragment;
import java.lang.reflect.InvocationTargetException;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import me.grishka.appkit.FragmentStackActivity; import me.grishka.appkit.FragmentStackActivity;
@ -26,5 +29,12 @@ public class MainActivity extends FragmentStackActivity{
showFragmentClearingBackStack(fragment); showFragmentClearingBackStack(fragment);
} }
} }
if(BuildConfig.BUILD_TYPE.startsWith("appcenter")){
// Call the appcenter SDK wrapper through reflection because it is only present in beta builds
try{
Class.forName("org.joinmastodon.android.AppCenterWrapper").getMethod("init", Application.class).invoke(null, getApplication());
}catch(ClassNotFoundException|NoSuchMethodException|IllegalAccessException|InvocationTargetException ignore){}
}
} }
} }

5
mastodon/src/main/java/org/joinmastodon/android/MastodonApp.java
View File

@ -23,10 +23,5 @@ public class MastodonApp extends Application{
ImageCache.setParams(params); ImageCache.setParams(params);
NetworkUtils.setUserAgent("MastodonAndroid/"+BuildConfig.VERSION_NAME); NetworkUtils.setUserAgent("MastodonAndroid/"+BuildConfig.VERSION_NAME);
context=getApplicationContext(); context=getApplicationContext();
// Call the appcenter SDK wrapper through reflection because it is only present in beta builds
try{
Class.forName("org.joinmastodon.android.AppCenterWrapper").getMethod("init", Application.class).invoke(null, this);
}catch(ClassNotFoundException|NoSuchMethodException|IllegalAccessException|InvocationTargetException ignore){}
} }
} }