Fix OAuth, Update Strings, Update Release

Author: smashedr

.github/workflows/release.yaml

@@ -50,20 +50,24 @@ jobs:
       - name: "Debug Build"
         continue-on-error: true
         run: |
+          echo "ref: ${{ github.ref }}"
+          echo "name: ${{ github.repository_owner }}-debug"
+          echo "dir: ${{ env.debug }}"
+          echo "glob: ${{ env.debug }}/*.apk"
           ls -lAh ${{ env.debug }}
 
       - name: "Upload Artifacts"
         if: ${{ !github.event.act }}
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.GITHUB_REPOSITORY_OWNER }}-debug
+          name: ${{ github.repository_owner }}-debug
           path: ${{ env.debug }}
 
       - name: "Upload to Release"
         if: ${{ github.event_name == 'release' }}
         uses: svenstaro/upload-release-action@v2
         with:
-          file: ${{ env.debug }}
+          file: ${{ env.debug }}/*.apk
           tag: ${{ github.ref }}
           overwrite: true
           file_glob: true

README.md

@@ -30,9 +30,30 @@ The URL to the file is automatically copied to the clipboard and the preview is
 
 ## Install
 
-Until the app is published it must be loaded with [ADB](https://developer.android.com/tools/adb).  
+Until the app is published it must be loaded with [ADB](https://developer.android.com/tools/adb) or [Android Studio](https://developer.android.com/studio).  
 This requires using Android Studio or the command line interface.
 
+<details><summary>▶️ Click Here to View Quick CLI Steps</summary>
+
+```shell
+$ which adb
+C:\Users\Shane\Android\sdk\platform-tools\adb.EXE
+
+$ wget https://github.com/django-files/android-app/releases/latest/download/app-debug.apk
+
+$ adb devices
+List of devices attached
+RF9M33Z1Q0M     device
+
+$ adb -s RF9M33Z1Q0M install .\app-debug.apk
+Performing Streamed Install
+Success
+```
+
+See below for more details...
+
+</details>
+
 1. Download and Install Android Studio or the Android SDK Platform Tools.
 
 https://developer.android.com/studio  
@@ -57,6 +78,13 @@ RF9M33Z1Q0M     device
 
 https://github.com/django-files/android-app/releases
 
+```shell
+./gradlew build
+./gradlew assemble
+```
+
+Note: Use `gradlew.bat` for Windows.
+
 4. Unzip the release and change into the directory.
 
 The built apk should be here: `app/build/outputs/apk/debug`

app/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdk 29
         targetSdk 35
         versionCode 1
-        versionName "1.0"
+        versionName "0.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/djangofiles/djangofiles/MainActivity.java

@@ -172,28 +172,34 @@ public void showSettingsDialog() {
         Log.d("showSettingsDialog", "savedUrl: " + savedUrl);
 
         EditText input = new EditText(this);
-        input.setHint("Example: df.cssnr.com");
+        input.setHint(this.getString(R.string.settings_input_place));
         if (savedUrl != null) {
             input.setText(savedUrl);
         }
+        input.requestFocus();
 
         runOnUiThread(() -> {
             new AlertDialog.Builder(this)
-                    .setTitle("App Settings")
+                    .setCancelable(false)
+                    .setTitle(this.getString(R.string.settings_title))
+                    .setMessage(this.getString(R.string.settings_message))
                     .setView(input)
                     .setNegativeButton("Exit", (dialog, which) -> finish())
                     .setPositiveButton("OK", (dialog, which) -> {
                         String url = input.getText().toString().trim();
                         Log.d("showSettingsDialog", "setPositiveButton: url:" + url);
                         if (url.isEmpty()) {
                             // TODO: Need to add verification here and keep dialog open...
-                            Toast.makeText(this, "Please enter a valid URL", Toast.LENGTH_SHORT).show();
+                            Toast.makeText(this, this.getString(R.string.settings_tst_invalid), Toast.LENGTH_SHORT).show();
                             finish();
                             return;
                         }
                         if (!url.startsWith("http://") && !url.startsWith("https://")) {
                             url = "https://" + url;
                         }
+                        if (url.endsWith("/")) {
+                            url = url.substring(0, url.length() - 1);
+                        }
                         if (!Objects.equals(savedUrl, url)) {
                             Log.d("showSettingsDialog", "Saving New URL.");
                             preferences.edit().putString(URL_KEY, url).apply();
@@ -235,6 +241,7 @@ private void processSharedFile(Uri fileUri) {
         String authToken = preferences.getString(TOKEN_KEY, null);
         Log.d("processSharedFile", "authToken: " + authToken);
         if (savedUrl == null) {
+            // TODO: Show settings dialog here...
             Toast.makeText(this, "Saved URL is not found", Toast.LENGTH_SHORT).show();
             return;
         }
@@ -396,14 +403,21 @@ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request
             SharedPreferences preferences = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
             String savedUrl = preferences.getString(URL_KEY, null);
             String requestUrl = request.getUrl().toString();
+            Log.d("shouldOverrideUrlLoading", "requestUrl: " + requestUrl);
 
             if ((savedUrl != null && requestUrl.startsWith(savedUrl)) ||
-                    requestUrl.startsWith("https://discord.com/oauth2")) {
+                    requestUrl.startsWith("https://discord.com/oauth2") ||
+                    requestUrl.startsWith("https://github.com/sessions/two-factor/app") ||
+                    requestUrl.startsWith("https://github.com/login") ||
+                    requestUrl.startsWith("https://accounts.google.com/v3/signin") ||
+                    requestUrl.startsWith("https://accounts.google.com/o/oauth2/v2/auth")) {
+                Log.d("shouldOverrideUrlLoading", "FALSE");
                 return false;
             }
 
             Intent intent = new Intent(Intent.ACTION_VIEW, request.getUrl());
             startActivity(intent);
+            Log.d("shouldOverrideUrlLoading", "TRUE");
             return true;
         }
     }

app/src/main/res/values/strings.xml

@@ -1,3 +1,8 @@
 <resources>
     <string name="app_name">Django Files</string>
+
+    <string name="settings_title">App Settings</string>
+    <string name="settings_message">Set or Change the Django Files URL</string>
+    <string name="settings_input_place">your.django-files.com</string>
+    <string name="settings_tst_invalid">Please enter a valid URL</string>
 </resources>