Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/analysis/findbugs-results.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
409
413
2 changes: 1 addition & 1 deletion scripts/analysis/lint-results.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE
<span class="mdl-layout-title">Lint Report: 73 warnings</span>
<span class="mdl-layout-title">Lint Report: 74 warnings</span>
5 changes: 4 additions & 1 deletion src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,10 @@
<activity android:name=".ui.activity.ExternalSiteWebView"
android:configChanges="orientation|screenSize|keyboardHidden" />
<activity
android:name=".ui.activity.RichDocumentsWebView"
android:name=".ui.activity.RichDocumentsEditorWebView"
android:configChanges="orientation|screenSize|keyboardHidden" />
<activity
android:name=".ui.activity.TextEditorWebView"
android:configChanges="orientation|screenSize|keyboardHidden"/>
<activity android:name=".ui.activity.ContactsPreferenceActivity"
android:launchMode="singleInstance"/>
Expand Down
14 changes: 8 additions & 6 deletions src/main/java/com/nextcloud/client/di/ComponentsModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,12 @@
import com.owncloud.android.ui.activity.PassCodeActivity;
import com.owncloud.android.ui.activity.ReceiveExternalFilesActivity;
import com.owncloud.android.ui.activity.RequestCredentialsActivity;
import com.owncloud.android.ui.activity.RichDocumentsWebView;
import com.owncloud.android.ui.activity.RichDocumentsEditorWebView;
import com.owncloud.android.ui.activity.SettingsActivity;
import com.owncloud.android.ui.activity.ShareActivity;
import com.owncloud.android.ui.activity.SsoGrantPermissionActivity;
import com.owncloud.android.ui.activity.SyncedFoldersActivity;
import com.owncloud.android.ui.activity.TextEditorWebView;
import com.owncloud.android.ui.activity.UploadFilesActivity;
import com.owncloud.android.ui.activity.UploadListActivity;
import com.owncloud.android.ui.activity.UserInfoActivity;
Expand All @@ -76,6 +77,7 @@
import com.owncloud.android.ui.preview.PreviewImageFragment;
import com.owncloud.android.ui.preview.PreviewMediaFragment;
import com.owncloud.android.ui.preview.PreviewTextFragment;
import com.owncloud.android.ui.preview.PreviewTextStringFragment;
import com.owncloud.android.ui.preview.PreviewVideoActivity;
import com.owncloud.android.ui.trashbin.TrashbinActivity;

Expand Down Expand Up @@ -106,15 +108,12 @@ abstract class ComponentsModule {
@ContributesAndroidInjector abstract ManageAccountsActivity manageAccountsActivity();
@ContributesAndroidInjector abstract ManageSpaceActivity manageSpaceActivity();
@ContributesAndroidInjector abstract NotificationsActivity notificationsActivity();

@ContributesAndroidInjector
abstract CommunityActivity participateActivity();
@ContributesAndroidInjector abstract CommunityActivity participateActivity();
@ContributesAndroidInjector abstract PassCodeActivity passCodeActivity();
@ContributesAndroidInjector abstract PreviewImageActivity previewImageActivity();
@ContributesAndroidInjector abstract PreviewVideoActivity previewVideoActivity();
@ContributesAndroidInjector abstract ReceiveExternalFilesActivity receiveExternalFilesActivity();
@ContributesAndroidInjector abstract RequestCredentialsActivity requestCredentialsActivity();
@ContributesAndroidInjector abstract RichDocumentsWebView richDocumentsWebView();
@ContributesAndroidInjector abstract SettingsActivity settingsActivity();
@ContributesAndroidInjector abstract ShareActivity shareActivity();
@ContributesAndroidInjector abstract SsoGrantPermissionActivity ssoGrantPermissionActivity();
Expand All @@ -126,6 +125,9 @@ abstract class ComponentsModule {
@ContributesAndroidInjector abstract WhatsNewActivity whatsNewActivity();
@ContributesAndroidInjector abstract EtmActivity etmActivity();

@ContributesAndroidInjector abstract RichDocumentsEditorWebView richDocumentsWebView();
@ContributesAndroidInjector abstract TextEditorWebView textEditorWebView();

@ContributesAndroidInjector abstract ExtendedListFragment extendedListFragment();
@ContributesAndroidInjector abstract FileDetailFragment fileDetailFragment();
@ContributesAndroidInjector abstract LocalFileListFragment localFileListFragment();
Expand All @@ -137,7 +139,7 @@ abstract class ComponentsModule {
@ContributesAndroidInjector abstract ContactListFragment chooseContactListFragment();
@ContributesAndroidInjector abstract PreviewMediaFragment previewMediaFragment();
@ContributesAndroidInjector abstract PreviewTextFragment previewTextFragment();

@ContributesAndroidInjector abstract PreviewTextStringFragment previewTextStringFragment();
@ContributesAndroidInjector abstract PhotoFragment photoFragment();

@ContributesAndroidInjector abstract MultipleAccountsDialog multipleAccountsDialog();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
* Database provider for handling the persistence aspects of arbitrary data table.
*/
public class ArbitraryDataProvider {
public static final String DIRECT_EDITING = "DIRECT_EDITING";
public static final String DIRECT_EDITING_ETAG = "DIRECT_EDITING_ETAG";

private static final String TAG = ArbitraryDataProvider.class.getSimpleName();
private static final String TRUE = "true";

Expand Down
Loading