mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 05:35:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Enable auto upload on Android 6+ only :-/

Browse source
This commit is contained in:
Mario Danic 2017-02-15 11:24:29 +01:00 committed by AndyScherzinger
parent 5c3cd5f6f8
commit 91c28ee158
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
View file

@ -58,7 +58,7 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
Log_OC.d(TAG, "Received: " + intent.getAction());
if (intent.getAction().equals(NEW_PHOTO_ACTION_UNOFFICIAL)) {
handleNewPictureAction(context, intent);

4
src/com/owncloud/android/ui/activity/DrawerActivity.java
View file

@ -175,8 +175,8 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
setupQuotaElement();
// show folder sync menu item only for Android 5+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
// show folder sync menu item only for Android 6+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
mNavigationView.getMenu().removeItem(R.id.nav_folder_sync);
}
}

2
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file

@ -257,7 +257,7 @@ public class FileDisplayActivity extends HookActivity
*/
private void upgradeNotificationForInstantUpload() {
// check for Android 5+ if legacy instant upload is activated --> disable + show info
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP &&
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
(PreferenceManager.instantPictureUploadEnabled(this) ||
PreferenceManager.instantPictureUploadEnabled(this))) {

4
src/com/owncloud/android/ui/activity/Preferences.java
View file

@ -368,8 +368,8 @@ public class Preferences extends PreferenceActivity
mPrefInstantUploadCategory = (PreferenceCategory) findPreference("instant_uploading_category");
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
// Instant upload via preferences on pre pre Lollipop
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
// Instant upload via preferences on pre pre M
mPrefInstantUploadPath = findPreference("instant_upload_path");
if (mPrefInstantUploadPath != null) {