WallyHackenslacker/moasdawiki-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update minimum supported Android API to 33

Browse Source
This commit is contained in:
Herbert Reiter
2025-08-30 15:36:20 +02:00
parent 016a20dca8
commit d11478d92c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle
+1 -1
View File
@@ -5,7 +5,7 @@ android {
compileSdk = 36 // 36 = Android 16 compileSdk = 36 // 36 = Android 16
defaultConfig { defaultConfig {
applicationId "net.moasdawiki.app" applicationId "net.moasdawiki.app"
minSdk = 28 // 28 = Android 9 minSdk = 33 // 33 = Android 13 Tiramisu
targetSdk = 36 // should be same as compileSdk targetSdk = 36 // should be same as compileSdk
versionCode = 47 versionCode = 47
versionName = "3.9.5.0" versionName = "3.9.5.0"
app/src/main/java/net/moasdawiki/app/MainActivity.java
+6 -6
View File
@@ -44,6 +44,8 @@ import android.widget.LinearLayout;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import android.window.OnBackInvokedCallback;
import android.window.OnBackInvokedDispatcher;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@@ -61,7 +63,6 @@ import net.moasdawiki.service.repository.RepositoryService;
import net.moasdawiki.util.EscapeUtils; import net.moasdawiki.util.EscapeUtils;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.util.Arrays; import java.util.Arrays;
@@ -75,7 +76,7 @@ import java.util.concurrent.Executors;
/** /**
* Displays the main window with the embedded wiki browser. * Displays the main window with the embedded wiki browser.
*/ */
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity implements OnBackInvokedCallback {
private static final String TAG = "MainActivity"; private static final String TAG = "MainActivity";
private static final String SERVER_BASE_URL = "http://localhost:1/"; private static final String SERVER_BASE_URL = "http://localhost:1/";
@@ -114,6 +115,8 @@ public class MainActivity extends AppCompatActivity {
return false; return false;
} }
}); });
getOnBackInvokedDispatcher().registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_DEFAULT, this);
} }
/** /**
@@ -263,9 +266,7 @@ public class MainActivity extends AppCompatActivity {
super.onRequestPermissionsResult(requestCode, permissions, grantResults); super.onRequestPermissionsResult(requestCode, permissions, grantResults);
} }
@Override public void onBackInvoked() {
public void onBackPressed() {
// webview.canGoBack() always returns false
WebBackForwardList backForwardList = webview.copyBackForwardList(); WebBackForwardList backForwardList = webview.copyBackForwardList();
Log.d(TAG, "Back button pressed, backForwardList index == " + backForwardList.getCurrentIndex()); Log.d(TAG, "Back button pressed, backForwardList index == " + backForwardList.getCurrentIndex());
if (backForwardList.getCurrentIndex() > 0) { if (backForwardList.getCurrentIndex() > 0) {
@@ -274,7 +275,6 @@ public class MainActivity extends AppCompatActivity {
// Close app // Close app
finish(); finish();
} }
super.onBackPressed();
} }
public void onConfigurationHintClicked(@SuppressWarnings("unused") View view) { public void onConfigurationHintClicked(@SuppressWarnings("unused") View view) {