Merge remote-tracking branch 'remotes/tom-repo/develop' into PhotonQyv-Baseline
This commit is contained in:
commit
bf7da2ebd6
|
@ -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"
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue