Merge pull request #1060 from zhwanng/master

v3.0.9
- add WebAuthn feature
- update some feats
- fix some bugs

Author: zhwanng

app/build.gradle

@@ -14,8 +14,8 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         compileSdk rootProject.ext.compileSdkVersion
 
-        versionCode 162
-        versionName "3.0.8"
+        versionCode 163
+        versionName "3.0.9"
         multiDexEnabled true
 
         resValue "string", "authorities", defaultConfig.applicationId + '.debug.cameraupload.provider'
@@ -194,7 +194,7 @@ android {
         implementation 'androidx.core:core-splashscreen:1.0.1'
         implementation "androidx.appcompat:appcompat:1.7.0"
         implementation "androidx.activity:activity:1.9.3"
-        implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+        implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
         implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
         implementation "androidx.preference:preference:1.2.1"
 //        implementation "androidx.datastore:datastore-preferences:1.0.0"

app/src/main/AndroidManifest.xml

@@ -108,9 +108,9 @@
             android:name=".ui.account.AccountsActivity"
             android:launchMode="singleTop" />
 
-        <activity android:name=".ui.account.SingleSignOnActivity" />
+        <activity android:name=".ui.account.sso.SingleSignOnActivity" />
 
-        <activity android:name=".ui.account.SingleSignOnAuthorizeActivity" />
+        <activity android:name=".ui.account.sso.SingleSignOnAuthorizeActivity" />
 
         <activity android:name=".ui.settings.SettingsActivity" />
 

app/src/main/java/com/seafile/seadroid2/framework/data/model/SSOLinkModel.java

@@ -0,0 +1,5 @@
+package com.seafile.seadroid2.framework.data.model;
+
+public class SSOLinkModel {
+    public String link;
+}

app/src/main/java/com/seafile/seadroid2/framework/data/model/SSOStatusModel.java

@@ -0,0 +1,7 @@
+package com.seafile.seadroid2.framework.data.model;
+
+public class SSOStatusModel {
+    public String status;
+    public String username;
+    public String apiToken;
+}

app/src/main/java/com/seafile/seadroid2/provider/SeafileProvider.java

@@ -19,8 +19,6 @@
 
 package com.seafile.seadroid2.provider;
 
-import static android.os.ParcelFileDescriptor.MODE_WRITE_ONLY;
-
 import android.accounts.OnAccountsUpdateListener;
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
@@ -418,19 +416,21 @@ public ParcelFileDescriptor openDocument(final String documentId, final String m
             throw new FileNotFoundException();
         }
 
-
         int accessMode = ParcelFileDescriptor.parseMode(mode);
-        boolean writeOnly = (accessMode & MODE_WRITE_ONLY) != 0;
-        if (writeOnly) {
-            //So far write operations are not supported.
-            throw new UnsupportedOperationException();
-        }
+        boolean isWriteMode =
+                (accessMode & ParcelFileDescriptor.MODE_WRITE_ONLY) != 0
+                ||
+                (accessMode & ParcelFileDescriptor.MODE_READ_WRITE) != 0;
 
         //TODO check sync_time and modified_at
 
         //check local
         File file = DataManager.getLocalRepoFile(account, repoModel.repo_id, repoModel.repo_name, path);
         if (file.exists()) {
+            if (isWriteMode && !file.canWrite()) {
+                throw new UnsupportedOperationException();
+            }
+
             try {
                 return makeParcelFileDescriptor(file, mode);
             } catch (IOException e) {

app/src/main/java/com/seafile/seadroid2/ui/WidgetUtils.java

@@ -72,6 +72,19 @@ public static void openWith(Context context, File file) {
         }
     }
 
+    public static void openUrlByLocalBrowser(Context context, String url) {
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
+        intent.setData(Uri.parse(url));
+
+        boolean isAvailable = isIntentAvailable(context, intent);
+        if (isAvailable) {
+            context.startActivity(intent);
+        } else {
+            ToastUtils.showLong(R.string.activity_not_found);
+        }
+    }
+
     private static boolean isIntentAvailable(Context context, Intent intent) {
         if (Build.VERSION.SDK_INT < 30) {
             return context.getPackageManager().resolveActivity(intent, 0) != null;

app/src/main/java/com/seafile/seadroid2/ui/account/AccountDetailActivity.java

@@ -255,6 +255,7 @@ private void onLoggedIn(Account loginAccount) {
         retData.putExtra(SeafileAuthenticatorActivity.ARG_NAME, loginAccount.getName());
         retData.putExtra(SeafileAuthenticatorActivity.ARG_AUTH_SESSION_KEY, loginAccount.getSessionKey());
         retData.putExtra(SeafileAuthenticatorActivity.ARG_SERVER_URI, loginAccount.getServer());
+        retData.putExtra(SeafileAuthenticatorActivity.ARG_SHIB, true);
         retData.putExtra(TWO_FACTOR_AUTH, binding.rememberDevice.isChecked());
         setResult(RESULT_OK, retData);
         finish();

app/src/main/java/com/seafile/seadroid2/ui/account/AccountService.java

@@ -1,6 +1,8 @@
 package com.seafile.seadroid2.ui.account;
 
 import com.seafile.seadroid2.account.AccountInfo;
+import com.seafile.seadroid2.framework.data.model.SSOLinkModel;
+import com.seafile.seadroid2.framework.data.model.SSOStatusModel;
 import com.seafile.seadroid2.framework.data.model.TokenModel;
 
 import java.util.Map;
@@ -15,7 +17,6 @@
 import retrofit2.http.POST;
 import retrofit2.http.PartMap;
 import retrofit2.http.Path;
-import retrofit2.http.Query;
 
 public interface AccountService {
 
@@ -33,4 +34,10 @@ public interface AccountService {
 
     @GET("api2/account/info/")
     Call<AccountInfo> getAccountInfoCall();
+
+    @POST("api2/client-sso-link/")
+    Single<SSOLinkModel> getSsoLink();
+
+    @GET("api2/client-sso-link/{token}/")
+    Single<SSOStatusModel> getSsoStatus(@Path("token") String token);
 }

app/src/main/java/com/seafile/seadroid2/ui/account/SeafileAuthenticatorActivity.java

@@ -30,6 +30,8 @@
 import com.seafile.seadroid2.framework.http.HttpIO;
 import com.seafile.seadroid2.framework.util.SLogs;
 import com.seafile.seadroid2.preferences.ContextStackPreferenceHelper;
+import com.seafile.seadroid2.ui.account.sso.SingleSignOnActivity;
+import com.seafile.seadroid2.ui.account.sso.SingleSignOnAuthorizeActivity;
 import com.seafile.seadroid2.ui.camera_upload.CameraUploadManager;
 
 import java.util.Locale;