Skip to content

Commit 900e14c

Browse files
committed
Fixed bug in ReaderTagTable that caused tbl_tag_updates to always overwrite the existing row when updating a date column
0 parents  commit 900e14c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3884
-0
lines changed

.gitignore

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# generated files
2+
build/
3+
4+
# Local configuration file (sdk path, etc)
5+
local.properties
6+
tools/deploy-mvn-artifact.conf
7+
8+
# Intellij project files
9+
*.iml
10+
*.ipr
11+
*.iws
12+
.idea/
13+
14+
# Gradle
15+
.gradle/
16+
gradle.properties
17+
18+
# Idea
19+
.idea/workspace.xml
20+
*.iml
21+
22+
# OS X
23+
.DS_Store
24+
25+
# dependencies

WordPressUtils/build.gradle

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
2+
buildscript {
3+
repositories {
4+
mavenCentral()
5+
}
6+
dependencies {
7+
classpath 'com.android.tools.build:gradle:0.12.+'
8+
}
9+
}
10+
11+
apply plugin: 'com.android.library'
12+
apply plugin: 'maven'
13+
14+
repositories {
15+
mavenCentral()
16+
maven { url 'http://wordpress-mobile.github.io/WordPress-Android' }
17+
}
18+
19+
dependencies {
20+
compile 'commons-lang:commons-lang:2.6'
21+
compile 'com.mcxiaoke.volley:library:1.0.+'
22+
compile 'com.github.castorflex.smoothprogressbar:library:0.4.0'
23+
compile 'org.wordpress:pulltorefresh-main:+@aar' // org.wordpress version includes some fixes
24+
compile 'com.android.support:support-v13:19.0.+'
25+
}
26+
27+
android {
28+
defaultPublishConfig 'debug'
29+
30+
compileSdkVersion 19
31+
buildToolsVersion "19.1.0"
32+
33+
defaultConfig {
34+
applicationId "org.wordpress.android.util"
35+
versionName "1.0.2"
36+
versionCode 1
37+
minSdkVersion 14
38+
targetSdkVersion 19
39+
}
40+
}
41+
42+
uploadArchives {
43+
repositories {
44+
mavenDeployer {
45+
def repo_url = ""
46+
if (project.hasProperty("repository")) {
47+
repo_url = project.repository
48+
}
49+
repository(url: repo_url)
50+
pom.version = android.defaultConfig.versionName
51+
pom.groupId = "org.wordpress"
52+
pom.artifactId = "wordpress-utils"
53+
}
54+
}
55+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
repository=file:///Users/max/work/automattic/WordPress-Android-gh-pages/
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="org.wordpress.android.util">
4+
5+
</manifest>
Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
/*
2+
* Copyright (C) 2011 wordpress.org
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.wordpress.android.util;
18+
19+
import android.app.AlertDialog;
20+
import android.app.Dialog;
21+
import android.content.Context;
22+
import android.content.DialogInterface;
23+
24+
public class AlertUtil {
25+
/**
26+
* Show Alert Dialog
27+
* @param context
28+
* @param titleId
29+
* @param messageId
30+
*/
31+
public static void showAlert(Context context, int titleId, int messageId) {
32+
Dialog dlg = new AlertDialog.Builder(context)
33+
.setTitle(titleId)
34+
.setPositiveButton(android.R.string.ok, null)
35+
.setMessage(messageId)
36+
.create();
37+
38+
dlg.show();
39+
}
40+
41+
/**
42+
* Show Alert Dialog
43+
* @param context
44+
* @param titleId
45+
* @param messageId
46+
*/
47+
public static void showAlert(Context context, int titleId, String message) {
48+
Dialog dlg = new AlertDialog.Builder(context)
49+
.setTitle(titleId)
50+
.setPositiveButton(android.R.string.ok, null)
51+
.setMessage(message)
52+
.create();
53+
54+
dlg.show();
55+
}
56+
57+
/**
58+
* Show Alert Dialog
59+
* @param context
60+
* @param titleId
61+
* @param messageId
62+
* @param positiveButtontxt
63+
* @param positiveListener
64+
* @param negativeButtontxt
65+
* @param negativeListener
66+
*/
67+
public static void showAlert(Context context, int titleId, int messageId,
68+
CharSequence positiveButtontxt, DialogInterface.OnClickListener positiveListener,
69+
CharSequence negativeButtontxt, DialogInterface.OnClickListener negativeListener) {
70+
Dialog dlg = new AlertDialog.Builder(context)
71+
.setTitle(titleId)
72+
.setPositiveButton(positiveButtontxt, positiveListener)
73+
.setNegativeButton(negativeButtontxt, negativeListener)
74+
.setMessage(messageId)
75+
.setCancelable(false)
76+
.create();
77+
78+
dlg.show();
79+
}
80+
81+
/**
82+
* Show Alert Dialog
83+
* @param context
84+
* @param titleId
85+
* @param messageId
86+
* @param positiveButtontxt
87+
* @param positiveListener
88+
*/
89+
public static void showAlert(Context context, int titleId, String message,
90+
CharSequence positiveButtontxt, DialogInterface.OnClickListener positiveListener) {
91+
Dialog dlg = new AlertDialog.Builder(context)
92+
.setTitle(titleId)
93+
.setPositiveButton(positiveButtontxt, positiveListener)
94+
.setMessage(message)
95+
.setCancelable(false)
96+
.create();
97+
98+
dlg.show();
99+
}
100+
}
101+

0 commit comments

Comments
 (0)