missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix GnuCash build

Browse source
This commit is contained in:
أحمد المحمودي (Ahmed El-Mahmoudy) 2015-06-24 12:59:13 +02:00
parent 57dfb2ba6d
commit 1fa7db8e58
2 changed files with 73 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
metadata/org.gnucash.android.txt
View file

@ -144,7 +144,6 @@ Build:1.5.5,48
target=android-21
Build:1.6.0,16006
disable=crash
commit=v1.6.0
subdir=app
gradle=production
@ -153,6 +152,7 @@ Build:1.6.0,16006
srclibs=CWACMerge@v1.1.1,CWACSacklist@v1.0.2,MPAndroidChart@v2.1.0,ViewPagerIndicator@2.4.1
prebuild=sed -e "/\<Crashlytics\>/ d" -i `grep -lr "\<Crashlytics\>" src/main/java/` && \
sed -e "/crashlytics/ d" -i build.gradle ../build.gradle && \
sed -e "/USE_CRASHLYTICS/ d" -i src/main/java/org/gnucash/android/app/GnuCashApplication.java && \
sed -e "/gms/ d" -i build.gradle && \
sed -e "/cwac/ d" -i build.gradle && \
sed -e "/maven\s*{\s*url.*}/ d" -i ../build.gradle && \

77
metadata/org.gnucash.android/disable_gms_dropbox.diff
View file

@ -314,17 +314,20 @@ index ba20e61..0833f79 100644
case SD_CARD:
copyExportToSDCard();
return true;
@@ -215,9 +191,6 @@ public class ExportAsyncTask extends AsyncTask<ExportParams, Void, Boolean> {
case DROPBOX:
targetLocation = "DropBox -> Apps -> GnuCash";
@@ -212,12 +188,6 @@ public class ExportAsyncTask extends AsyncTask<ExportParams, Void, Boolean> {
case SD_CARD:
targetLocation = "SD card";
break;
- case DROPBOX:
- targetLocation = "DropBox -> Apps -> GnuCash";
- break;
- case GOOGLE_DRIVE:
- targetLocation = "Google Drive -> " + mContext.getString(R.string.app_name);
- break;
default:
targetLocation = "external service";
}
@@ -246,68 +219,6 @@ public class ExportAsyncTask extends AsyncTask<ExportParams, Void, Boolean> {
@@ -246,68 +216,6 @@ public class ExportAsyncTask extends AsyncTask<ExportParams, Void, Boolean> {
}
}
@ -393,7 +396,7 @@ index ba20e61..0833f79 100644
/**
* Returns the mime type for the configured export format
* @return MIME type as string
@@ -323,36 +234,6 @@ public class ExportAsyncTask extends AsyncTask<ExportParams, Void, Boolean> {
@@ -323,36 +231,6 @@ public class ExportAsyncTask extends AsyncTask<ExportParams, Void, Boolean> {
}
}
@ -430,3 +433,67 @@ index ba20e61..0833f79 100644
/**
* Returns the list of files generated by one export session.
* <p>Typically it is one file. But QIF export generate multiple files per currency.</p>
diff --git a/app/src/main/java/org/gnucash/android/export/ExportParams.java b/app/src/main/java/org/gnucash/android/export/ExportParams.java
index 120d052..b69aa01 100644
--- a/app/src/main/java/org/gnucash/android/export/ExportParams.java
+++ b/app/src/main/java/org/gnucash/android/export/ExportParams.java
@@ -33,7 +33,7 @@ public class ExportParams {
* Options for the destination of the exported transctions file.
* It could be stored on the {@link #SD_CARD} or exported through another program via {@link #SHARING}
*/
- public enum ExportTarget {SD_CARD, SHARING, DROPBOX, GOOGLE_DRIVE }
+ public enum ExportTarget {SD_CARD, SHARING}
/**
* Format to use for the exported transactions
diff --git a/app/src/main/res/xml/fragment_backup_preferences.xml b/app/src/main/res/xml/fragment_backup_preferences.xml
index 0b03b98..0dbe4f4 100644
--- a/app/src/main/res/xml/fragment_backup_preferences.xml
+++ b/app/src/main/res/xml/fragment_backup_preferences.xml
@@ -23,17 +23,6 @@
<Preference android:title="@string/title_restore_backup"
android:key="@string/key_restore_backup"
android:summary="@string/summary_restore_backup_pref" />
- <CheckBoxPreference android:title="@string/title_dropbox_sync_preference"
- android:summary="@string/summary_dropbox_sync"
- android:checked="false"
- android:key="@string/key_dropbox_sync"
- android:icon="@drawable/ic_dropbox_android" />
-
- <CheckBoxPreference android:title="@string/title_google_drive_sync_pref"
- android:summary="@string/summary_google_drive_sync"
- android:checked="false"
- android:key="@string/key_google_drive_sync"
- android:icon="@drawable/ic_google_drive" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/title_export_preference_category">
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3448ead..4090d50 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -100,24 +100,6 @@
<activity android:name=".ui.chart.PieChartActivity" />
<activity android:name=".ui.chart.LineChartActivity" />
<activity android:name=".ui.chart.BarChartActivity" />
- <activity android:name="com.dropbox.sync.android.DbxAuthActivity" />
- <activity
- android:name="com.dropbox.client2.android.AuthActivity"
- android:launchMode="singleTask"
- android:configChanges="orientation|keyboard">
- <intent-filter>
- <!-- Change this to be db- followed by your app key -->
- <data android:scheme="@string/manifest_dropbox_app_key" />
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.BROWSABLE"/>
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
- <service
- android:name="com.dropbox.sync.android.DbxSyncService"
- android:enabled="true"
- android:exported="false"
- android:label="Dropbox Sync" />
<service android:name=".service.SchedulerService"
android:exported="false"
android:label="GnuCash Android Scheduler Execution Service"/>