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

Merge remote-tracking branch 'remotes/tom-repo/develop' into PhotonQyv-Baseline

This commit is contained in:
PhotonQyv 2017-09-02 17:01:32 +01:00
parent 19ba21b2ee 0939039a98
commit bf7da2ebd6
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@ -90,7 +90,6 @@
android:label="@string/app_name"
android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="singleTask"
android:noHistory="true"
/>
<activity android:name="fr.gouv.etalab.mastodon.activities.MediaActivity"
android:label="@string/app_name"

17
app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewActivity.java
View File

@ -147,6 +147,20 @@ public class WebviewActivity extends AppCompatActivity {
this.url = newUrl;
}
@Override
public void onPause(){
super.onPause();
if( webView != null)
webView.onPause();
}
@Override
public void onResume(){
super.onResume();
if( webView != null)
webView.onResume();
}
@Override
public void onBackPressed() {
if (webView.canGoBack()){
@ -159,6 +173,7 @@ public class WebviewActivity extends AppCompatActivity {
@Override
public void onDestroy(){
super.onDestroy();
if( webView != null)
webView.destroy();
}
}