Removed update repo from AB. Fix for new installs with repo version.
This commit is contained in:
Peter Serwylo
parent
c262a8dd52
commit
1bed5ff87c
@ -422,6 +422,7 @@ public class DB {
|
|||||||
+ "name text, description text, inuse integer not null, "
|
+ "name text, description text, inuse integer not null, "
|
||||||
+ "priority integer not null, pubkey text, fingerprint text, "
|
+ "priority integer not null, pubkey text, fingerprint text, "
|
||||||
+ "maxage integer not null default 0, "
|
+ "maxage integer not null default 0, "
|
||||||
|
+ "version integer not null default 0, "
|
||||||
+ "lastetag text);";
|
+ "lastetag text);";
|
||||||
|
|
||||||
public static class Repo {
|
public static class Repo {
|
||||||
|
|||||||
@ -131,11 +131,8 @@ public class FDroid extends FragmentActivity {
|
|||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
|
|
||||||
super.onCreateOptionsMenu(menu);
|
super.onCreateOptionsMenu(menu);
|
||||||
MenuItem update = menu.add(Menu.NONE, UPDATE_REPO, 1, R.string.menu_update_repo).setIcon(
|
menu.add(Menu.NONE, UPDATE_REPO, 1, R.string.menu_update_repo).setIcon(
|
||||||
android.R.drawable.ic_menu_rotate);
|
android.R.drawable.ic_menu_rotate);
|
||||||
MenuItemCompat.setShowAsAction(update,
|
|
||||||
MenuItemCompat.SHOW_AS_ACTION_ALWAYS |
|
|
||||||
MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
|
|
||||||
menu.add(Menu.NONE, MANAGE_REPO, 2, R.string.menu_manage).setIcon(
|
menu.add(Menu.NONE, MANAGE_REPO, 2, R.string.menu_manage).setIcon(
|
||||||
android.R.drawable.ic_menu_agenda);
|
android.R.drawable.ic_menu_agenda);
|
||||||
MenuItem search = menu.add(Menu.NONE, SEARCH, 3, R.string.menu_search).setIcon(
|
MenuItem search = menu.add(Menu.NONE, SEARCH, 3, R.string.menu_search).setIcon(
|
||||||
|
|||||||
45
tests/client-test.iml
Normal file
45
tests/client-test.iml
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="JAVA_MODULE" version="4">
|
||||||
|
<component name="FacetManager">
|
||||||
|
<facet type="android" name="Android">
|
||||||
|
<configuration>
|
||||||
|
<option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/gen" />
|
||||||
|
<option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/gen" />
|
||||||
|
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/AndroidManifest.xml" />
|
||||||
|
<option name="RES_FOLDER_RELATIVE_PATH" value="/res" />
|
||||||
|
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/assets" />
|
||||||
|
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/libs" />
|
||||||
|
<option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
|
||||||
|
<option name="CUSTOM_APK_RESOURCE_FOLDER" value="" />
|
||||||
|
<option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />
|
||||||
|
<option name="CUSTOM_COMPILER_MANIFEST" value="" />
|
||||||
|
<option name="APK_PATH" value="" />
|
||||||
|
<option name="LIBRARY_PROJECT" value="false" />
|
||||||
|
<option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="true" />
|
||||||
|
<option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
|
||||||
|
<option name="PACK_TEST_CODE" value="true" />
|
||||||
|
<option name="RUN_PROGUARD" value="false" />
|
||||||
|
<option name="PROGUARD_CFG_PATH" value="/proguard-project.txt" />
|
||||||
|
<option name="USE_CUSTOM_MANIFEST_PACKAGE" value="false" />
|
||||||
|
<option name="CUSTOM_MANIFEST_PACKAGE" value="" />
|
||||||
|
<resOverlayFolders>
|
||||||
|
<path>/res-overlay</path>
|
||||||
|
</resOverlayFolders>
|
||||||
|
<includeSystemProguardFile>true</includeSystemProguardFile>
|
||||||
|
<includeAssetsFromLibraries>false</includeAssetsFromLibraries>
|
||||||
|
<additionalNativeLibs />
|
||||||
|
</configuration>
|
||||||
|
</facet>
|
||||||
|
</component>
|
||||||
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
|
<exclude-output />
|
||||||
|
<content url="file://$MODULE_DIR$">
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
|
||||||
|
</content>
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
<orderEntry type="module" module-name="client" scope="PROVIDED" />
|
||||||
|
</component>
|
||||||
|
</module>
|
||||||
|
|
||||||
45
tests/client-tests.iml
Normal file
45
tests/client-tests.iml
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="JAVA_MODULE" version="4">
|
||||||
|
<component name="FacetManager">
|
||||||
|
<facet type="android" name="Android">
|
||||||
|
<configuration>
|
||||||
|
<option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/gen" />
|
||||||
|
<option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/gen" />
|
||||||
|
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/AndroidManifest.xml" />
|
||||||
|
<option name="RES_FOLDER_RELATIVE_PATH" value="/res" />
|
||||||
|
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/assets" />
|
||||||
|
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/libs" />
|
||||||
|
<option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
|
||||||
|
<option name="CUSTOM_APK_RESOURCE_FOLDER" value="" />
|
||||||
|
<option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />
|
||||||
|
<option name="CUSTOM_COMPILER_MANIFEST" value="" />
|
||||||
|
<option name="APK_PATH" value="" />
|
||||||
|
<option name="LIBRARY_PROJECT" value="false" />
|
||||||
|
<option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="true" />
|
||||||
|
<option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
|
||||||
|
<option name="PACK_TEST_CODE" value="true" />
|
||||||
|
<option name="RUN_PROGUARD" value="false" />
|
||||||
|
<option name="PROGUARD_CFG_PATH" value="/proguard-project.txt" />
|
||||||
|
<option name="USE_CUSTOM_MANIFEST_PACKAGE" value="false" />
|
||||||
|
<option name="CUSTOM_MANIFEST_PACKAGE" value="" />
|
||||||
|
<resOverlayFolders>
|
||||||
|
<path>/res-overlay</path>
|
||||||
|
</resOverlayFolders>
|
||||||
|
<includeSystemProguardFile>true</includeSystemProguardFile>
|
||||||
|
<includeAssetsFromLibraries>false</includeAssetsFromLibraries>
|
||||||
|
<additionalNativeLibs />
|
||||||
|
</configuration>
|
||||||
|
</facet>
|
||||||
|
</component>
|
||||||
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
|
<exclude-output />
|
||||||
|
<content url="file://$MODULE_DIR$">
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="true" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
|
||||||
|
</content>
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
<orderEntry type="module" module-name="client" scope="PROVIDED" />
|
||||||
|
</component>
|
||||||
|
</module>
|
||||||
|
|
||||||
10
tests/local.properties
Normal file
10
tests/local.properties
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
# This file is automatically generated by Android Tools.
|
||||||
|
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
||||||
|
#
|
||||||
|
# This file must *NOT* be checked into Version Control Systems,
|
||||||
|
# as it contains information specific to your local configuration.
|
||||||
|
|
||||||
|
# location of the SDK. This is only used by Ant
|
||||||
|
# For customization when using a Version Control System, please read the
|
||||||
|
# header note.
|
||||||
|
sdk.dir=/home/pete/apps/android
|
||||||
20
tests/proguard-project.txt
Normal file
20
tests/proguard-project.txt
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
# To enable ProGuard in your project, edit project.properties
|
||||||
|
# to define the proguard.config property as described in that file.
|
||||||
|
#
|
||||||
|
# Add project specific ProGuard rules here.
|
||||||
|
# By default, the flags in this file are appended to flags specified
|
||||||
|
# in ${sdk.dir}/tools/proguard/proguard-android.txt
|
||||||
|
# You can edit the include path and order by changing the ProGuard
|
||||||
|
# include property in project.properties.
|
||||||
|
#
|
||||||
|
# For more details, see
|
||||||
|
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||||
|
|
||||||
|
# Add any project specific keep options here:
|
||||||
|
|
||||||
|
# If your project uses WebView with JS, uncomment the following
|
||||||
|
# and specify the fully qualified class name to the JavaScript interface
|
||||||
|
# class:
|
||||||
|
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||||
|
# public *;
|
||||||
|
#}
|
||||||
14
tests/project.properties
Normal file
14
tests/project.properties
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
# This file is automatically generated by Android Tools.
|
||||||
|
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
||||||
|
#
|
||||||
|
# This file must be checked in Version Control Systems.
|
||||||
|
#
|
||||||
|
# To customize properties used by the Ant build system edit
|
||||||
|
# "ant.properties", and override values to adapt the script to your
|
||||||
|
# project structure.
|
||||||
|
#
|
||||||
|
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
|
||||||
|
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
|
||||||
|
|
||||||
|
# Project target.
|
||||||
|
target=android-17
|
||||||
Loading…
x
Reference in New Issue
Block a user