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

Bug fixes + downgrades some libs to avoid NRA with webview

This commit is contained in:
stom79 2018-03-17 18:28:07 +01:00
parent f6ed9c6f4c
commit b74c6d423f
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/build.gradle
View File

@ -20,6 +20,10 @@ android {
pseudoLocalesEnabled true
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
productFlavors {
fdroid {
@ -34,12 +38,12 @@ allprojects {
maven { url "https://maven.google.com"}
}
}
ext.supportLibraryVersion = '27.1.0'
ext.supportLibraryVersion = '27.0.2'
ext.glideLibraryVersion = '4.6.1'
ext.conscryptLibraryVersion = '1.0.1'
ext.evernoteLibraryVersion = '1.2.2'
ext.evernoteLibraryVersion = '1.2.4'
ext.gsonLibraryVersion = '2.8.2'
ext.guavaLibraryVersion = '23.6-android'
ext.guavaLibraryVersion = '24.1-android'
ext.photoViewLibraryVersion = '2.0.0'
ext.swipebackLibraryVersion = '1.0.2'
ext.ratethisappLibraryVersion = '1.2.0'

21
app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
View File

@ -142,16 +142,17 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve
action_refresh.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if( statuses != null)
swipeRefreshLayout.setRefreshing(true);
( new Handler()).postDelayed(new Runnable() {
@Override
public void run() {
isRefreshed = true;
statusId = statuses.get(statuses.size()-1).getId();
new RetrieveFeedsAsyncTask(getApplicationContext(), RetrieveFeedsAsyncTask.Type.ONESTATUS, statusId,null, false, false, ShowConversationActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
}, 1000);
if( statuses != null) {
swipeRefreshLayout.setRefreshing(true);
(new Handler()).postDelayed(new Runnable() {
@Override
public void run() {
isRefreshed = true;
statusId = statuses.get(statuses.size() - 1).getId();
new RetrieveFeedsAsyncTask(getApplicationContext(), RetrieveFeedsAsyncTask.Type.ONESTATUS, statusId, null, false, false, ShowConversationActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
}, 1000);
}
}
});
action_expand.setOnClickListener(new View.OnClickListener() {

7
app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
View File

@ -807,6 +807,11 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
@Override
protected Void doInBackground(Void... voids) {
if( this.fileWeakReference.get() == null) {
Toast.makeText(activityWeakReference.get(), R.string.toast_error, Toast.LENGTH_SHORT).show();
return null;
}
Bitmap takenImage = BitmapFactory.decodeFile(String.valueOf(this.fileWeakReference.get()));
int size = takenImage.getByteCount();
SharedPreferences sharedpreferences = this.activityWeakReference.get().getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
@ -836,6 +841,8 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
@Override
protected void onPostExecute(Void result) {
if( bs == null)
return;
ImageButton toot_picture;
LinearLayout toot_picture_container;
toot_picture = this.activityWeakReference.get().findViewById(R.id.toot_picture);